diff --git a/mozilla/accessible/src/base/nsAccessible.cpp b/mozilla/accessible/src/base/nsAccessible.cpp
index 8d1e4902fa1..e09a989f563 100644
--- a/mozilla/accessible/src/base/nsAccessible.cpp
+++ b/mozilla/accessible/src/base/nsAccessible.cpp
@@ -48,7 +48,7 @@ public:
   nsIFrame* GetChildBefore(nsIFrame* aParent, nsIFrame* aChild);
   PRInt32 GetCount(nsIFrame* aFrame);
 
-  static PRBool ShouldSkip(nsIPresContext* aContext, nsIAtom* aList, nsIFrame* aStart, nsIFrame* aNext);
+  static PRBool IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2);
   static void GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent);
 
   nsCOMPtr<nsIPresContext> mPresContext;
@@ -92,14 +92,10 @@ nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
   // get next sibling
   nsIFrame* next = nsnull;
   aFrame->GetNextSibling(&next);
-  nsIAtom* list = nsnull;
-  mOwner->GetListAtomForFrame(aFrame, list);
 
-  
   // skip any frames with the same content node
-  while(ShouldSkip(mPresContext, list, aFrame, next)) 
+  while(IsSameContent(aFrame,next)) 
     next->GetNextSibling(&next);
-  
 
   // if failed
   if (!next)
@@ -125,11 +121,7 @@ nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
       return nsnull;
     } else {
       // next on parent
-      nsIFrame* n = GetNextSibling(parent);
-      if (ShouldSkip(mPresContext, list, aFrame, n))
-        return GetNextSibling(n);
-      else 
-        return n;
+      return GetNextSibling(parent);
     }
   }
 
@@ -147,19 +139,11 @@ nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
   nsIFrame* first = GetFirstChild(next);
 
   // if found
-  if (first) {
-    if (ShouldSkip(mPresContext, list, aFrame, first))
-      return GetNextSibling(first);
-    else 
-      return first;
-  }
+  if (first)
+    return first;
 
   // call next on next
-  nsIFrame* n =  GetNextSibling(next);
-  if (ShouldSkip(mPresContext, list, aFrame, next))
-    return GetNextSibling(n);
-  else 
-    return n;
+  return GetNextSibling(next);
 }
 
 nsIFrame* nsFrameTreeWalker::GetFirstChild(nsIFrame* aFrame)
@@ -198,10 +182,7 @@ nsIFrame* nsFrameTreeWalker::GetFirstChild(nsIFrame* aFrame)
     child->GetNextSibling(&next);
 
     // skip children with duplicate content nodes
-    nsIAtom* list = nsnull;
-    mOwner->GetListAtomForFrame(child, list);
-
-    while(ShouldSkip(mPresContext, list, child, next)) 
+    while(IsSameContent(child,next)) 
       next->GetNextSibling(&next);
 
     child = next;
@@ -306,31 +287,23 @@ void nsFrameTreeWalker::GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>&
   if (!aAccessible)
     aAccessible = do_QueryInterface(aContent);
 
- // if (aAccessible)
- //   printf("Found accessible!\n");
+  if (aAccessible)
+    printf("Found accessible!\n");
 }
 
-PRBool nsFrameTreeWalker::ShouldSkip(nsIPresContext* aContext, nsIAtom* aList, nsIFrame* aStart, nsIFrame* aNext)
+PRBool nsFrameTreeWalker::IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2)
 {
-  if (!aStart || !aNext)
+  if (!aFrame1 || !aFrame2)
     return PR_FALSE;
 
-  // is content the same? If so skip it
   nsCOMPtr<nsIContent> content1;
   nsCOMPtr<nsIContent> content2;
 
-  aStart->GetContent(getter_AddRefs(content1));
-  aNext->GetContent(getter_AddRefs(content2));
-
-  if (content1 == content2 && content1 != nsnull) {
-    // does it have childen? It it does then don't skip it
-    nsIFrame* child = nsnull;
-    aNext->FirstChild(aContext, aList, &child);
-    if (child)
-      return PR_FALSE;
+  aFrame1->GetContent(getter_AddRefs(content1));
+  aFrame2->GetContent(getter_AddRefs(content2));
 
+  if (content1 == content2 && content1 != nsnull)
     return PR_TRUE;
-  }
   
   return PR_FALSE;
 }
@@ -827,7 +800,7 @@ NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width,
 
   start->GetRect(r);
   
-  while (nsFrameTreeWalker::ShouldSkip(context,nsnull, start, next))
+  while (nsFrameTreeWalker::IsSameContent(start, next))
   {
     nsRect r2;
     next->GetRect(r2);
diff --git a/mozilla/accessible/src/nsAccessible.cpp b/mozilla/accessible/src/nsAccessible.cpp
index 8d1e4902fa1..e09a989f563 100644
--- a/mozilla/accessible/src/nsAccessible.cpp
+++ b/mozilla/accessible/src/nsAccessible.cpp
@@ -48,7 +48,7 @@ public:
   nsIFrame* GetChildBefore(nsIFrame* aParent, nsIFrame* aChild);
   PRInt32 GetCount(nsIFrame* aFrame);
 
-  static PRBool ShouldSkip(nsIPresContext* aContext, nsIAtom* aList, nsIFrame* aStart, nsIFrame* aNext);
+  static PRBool IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2);
   static void GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent);
 
   nsCOMPtr<nsIPresContext> mPresContext;
@@ -92,14 +92,10 @@ nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
   // get next sibling
   nsIFrame* next = nsnull;
   aFrame->GetNextSibling(&next);
-  nsIAtom* list = nsnull;
-  mOwner->GetListAtomForFrame(aFrame, list);
 
-  
   // skip any frames with the same content node
-  while(ShouldSkip(mPresContext, list, aFrame, next)) 
+  while(IsSameContent(aFrame,next)) 
     next->GetNextSibling(&next);
-  
 
   // if failed
   if (!next)
@@ -125,11 +121,7 @@ nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
       return nsnull;
     } else {
       // next on parent
-      nsIFrame* n = GetNextSibling(parent);
-      if (ShouldSkip(mPresContext, list, aFrame, n))
-        return GetNextSibling(n);
-      else 
-        return n;
+      return GetNextSibling(parent);
     }
   }
 
@@ -147,19 +139,11 @@ nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
   nsIFrame* first = GetFirstChild(next);
 
   // if found
-  if (first) {
-    if (ShouldSkip(mPresContext, list, aFrame, first))
-      return GetNextSibling(first);
-    else 
-      return first;
-  }
+  if (first)
+    return first;
 
   // call next on next
-  nsIFrame* n =  GetNextSibling(next);
-  if (ShouldSkip(mPresContext, list, aFrame, next))
-    return GetNextSibling(n);
-  else 
-    return n;
+  return GetNextSibling(next);
 }
 
 nsIFrame* nsFrameTreeWalker::GetFirstChild(nsIFrame* aFrame)
@@ -198,10 +182,7 @@ nsIFrame* nsFrameTreeWalker::GetFirstChild(nsIFrame* aFrame)
     child->GetNextSibling(&next);
 
     // skip children with duplicate content nodes
-    nsIAtom* list = nsnull;
-    mOwner->GetListAtomForFrame(child, list);
-
-    while(ShouldSkip(mPresContext, list, child, next)) 
+    while(IsSameContent(child,next)) 
       next->GetNextSibling(&next);
 
     child = next;
@@ -306,31 +287,23 @@ void nsFrameTreeWalker::GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>&
   if (!aAccessible)
     aAccessible = do_QueryInterface(aContent);
 
- // if (aAccessible)
- //   printf("Found accessible!\n");
+  if (aAccessible)
+    printf("Found accessible!\n");
 }
 
-PRBool nsFrameTreeWalker::ShouldSkip(nsIPresContext* aContext, nsIAtom* aList, nsIFrame* aStart, nsIFrame* aNext)
+PRBool nsFrameTreeWalker::IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2)
 {
-  if (!aStart || !aNext)
+  if (!aFrame1 || !aFrame2)
     return PR_FALSE;
 
-  // is content the same? If so skip it
   nsCOMPtr<nsIContent> content1;
   nsCOMPtr<nsIContent> content2;
 
-  aStart->GetContent(getter_AddRefs(content1));
-  aNext->GetContent(getter_AddRefs(content2));
-
-  if (content1 == content2 && content1 != nsnull) {
-    // does it have childen? It it does then don't skip it
-    nsIFrame* child = nsnull;
-    aNext->FirstChild(aContext, aList, &child);
-    if (child)
-      return PR_FALSE;
+  aFrame1->GetContent(getter_AddRefs(content1));
+  aFrame2->GetContent(getter_AddRefs(content2));
 
+  if (content1 == content2 && content1 != nsnull)
     return PR_TRUE;
-  }
   
   return PR_FALSE;
 }
@@ -827,7 +800,7 @@ NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width,
 
   start->GetRect(r);
   
-  while (nsFrameTreeWalker::ShouldSkip(context,nsnull, start, next))
+  while (nsFrameTreeWalker::IsSameContent(start, next))
   {
     nsRect r2;
     next->GetRect(r2);
diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index 4b2412230ab..e83673a53a1 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -2438,7 +2438,7 @@ nsEventStateManager::ShiftFocus(PRBool forward, nsIContent* aRoot)
     mPresContext->GetContainer(getter_AddRefs(container));
     nsCOMPtr<nsIBaseWindow> docShellAsWin(do_QueryInterface(container));
     if (docShellAsWin) {
-      docShellAsWin->FocusAvailable(docShellAsWin, &focusTaken);
+      docShellAsWin->FocusAvailable(docShellAsWin, forward, &focusTaken);
     }
       
     //No one took focus and we're not already at the top of the doc
diff --git a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp
index 3271328b98f..25f001931f7 100644
--- a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp
@@ -594,6 +594,17 @@ BodyFixupRule::MapStyleInto(nsIMutableStyleContext* aContext,
     }
   }
 
+  // To fix the regression in bug 70831 caused by the fix to bug 67478,
+  // use the nsStyleColor that we would have used before the fix to
+  // bug 67478.
+  nsStyleColor* documentStyleColor = styleColor;
+  if (bodyStyleColor != styleColor && htmlStyleColor != styleColor) {
+    nsCompatibility mode;
+    aPresContext->GetCompatibilityMode(&mode);
+    if (eCompatibility_NavQuirks == mode)
+      documentStyleColor = bodyStyleColor;
+  }
+
   nsCOMPtr<nsIPresShell> presShell;
   aPresContext->GetShell(getter_AddRefs(presShell));
   if (presShell) {
@@ -607,10 +618,11 @@ BodyFixupRule::MapStyleInto(nsIMutableStyleContext* aContext,
         htmlContainer->GetAttributeStyleSheet(getter_AddRefs(styleSheet));
 
         if (styleSheet) {
-          styleSheet->SetDocumentForegroundColor(styleColor->mColor);
-          if (!(styleColor->mBackgroundFlags &
+          styleSheet->SetDocumentForegroundColor(documentStyleColor->mColor);
+          if (!(documentStyleColor->mBackgroundFlags &
                 NS_STYLE_BG_COLOR_TRANSPARENT)) {
-            styleSheet->SetDocumentBackgroundColor(styleColor->mBackgroundColor);
+            styleSheet->SetDocumentBackgroundColor(
+                          documentStyleColor->mBackgroundColor);
           }
         }
       }
diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 02933aa004c..e6ed502652e 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -20,6 +20,7 @@
  *   Travis Bogard <travis@netscape.com>
  *   Pierre Phaneuf <pp@ludusdesign.com>
  *   Peter Annema <disttsc@bart.nl>
+ *   Dan Rosen <dr@netscape.com>
  */
 
 #include "nsIComponentManager.h"
@@ -102,6 +103,10 @@
 #include "nsIFrame.h"
 #include "nsIStyleContext.h"
 
+// for embedding
+#include "nsIEmbeddingSiteWindow.h"
+#include "nsIWebBrowserChromeFocus.h"
+
 static NS_DEFINE_IID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID);
 static NS_DEFINE_CID(kSimpleURICID,            NS_SIMPLEURI_CID);
 static NS_DEFINE_CID(kDocumentCharsetInfoCID, NS_DOCUMENTCHARSETINFO_CID);
@@ -2025,14 +2030,31 @@ NS_IMETHODIMP nsDocShell::SetFocus()
   return NS_OK;
 }
 
-NS_IMETHODIMP nsDocShell::FocusAvailable(nsIBaseWindow* aCurrentFocus, 
+NS_IMETHODIMP nsDocShell::FocusAvailable(nsIBaseWindow* aCurrentFocus,
+                                         PRBool aForward,
                                          PRBool* aTookFocus)
 {
   NS_ENSURE_ARG_POINTER(aTookFocus);
-  
-  // Next person we should call is first the parent otherwise the 
-  // docshell tree owner.
 
+  nsresult ret;
+
+  // Are we embedded?
+
+  nsCOMPtr<nsIWebBrowserChromeFocus>
+    chromeFocus(do_GetInterface(mTreeOwner, &ret));
+  if (chromeFocus) {
+#ifdef DEBUG_dr
+    printf("dr :: nsDocShell::FocusAvailable, embedded\n");
+#endif
+    if (aForward)
+      ret = chromeFocus->FocusNextElement();
+    else
+      ret = chromeFocus->FocusPrevElement();
+    return ret;
+  }
+
+  // Otherwise, first person we should call is the parent, or the 
+  // docshell tree owner.
   nsCOMPtr<nsIBaseWindow> nextCallWin(do_QueryInterface(mParent));
   if(!nextCallWin)
     nextCallWin = do_QueryInterface(mTreeOwner);
@@ -2040,7 +2062,9 @@ NS_IMETHODIMP nsDocShell::FocusAvailable(nsIBaseWindow* aCurrentFocus,
   //If the current focus is us, offer it to the next owner.
   if(aCurrentFocus == NS_STATIC_CAST(nsIBaseWindow*, this)) {
     if(nextCallWin) {
-      nsresult ret = nextCallWin->FocusAvailable(aCurrentFocus, aTookFocus);
+      ret = nextCallWin->FocusAvailable(aCurrentFocus,
+                                        aForward,
+                                        aTookFocus);
       if (NS_SUCCEEDED(ret) && *aTookFocus)
         return NS_OK;
     }
@@ -2094,7 +2118,7 @@ NS_IMETHODIMP nsDocShell::FocusAvailable(nsIBaseWindow* aCurrentFocus,
 
   // Call again to offer focus upwards and to start at the beginning of our
   // child list if no one above us wants focus.
-  return FocusAvailable(this, aTookFocus);
+  return FocusAvailable(this, aForward, aTookFocus);
 }
 
 NS_IMETHODIMP nsDocShell::GetTitle(PRUnichar** aTitle)
diff --git a/mozilla/docshell/base/nsDocShell.h b/mozilla/docshell/base/nsDocShell.h
index fa37174f1b4..bfca595b63b 100644
--- a/mozilla/docshell/base/nsDocShell.h
+++ b/mozilla/docshell/base/nsDocShell.h
@@ -1,4 +1,4 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * The contents of this file are subject to the Mozilla Public
  * License Version 1.1 (the "License"); you may not use this file
diff --git a/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp b/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp
index 652ca36f454..daddf2dc5f0 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp
+++ b/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp
@@ -99,6 +99,7 @@ NS_IMPL_RELEASE(EmbedWindow)
 NS_INTERFACE_MAP_BEGIN(EmbedWindow)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebBrowserChrome)
   NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome)
+  NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChromeFocus)
   NS_INTERFACE_MAP_ENTRY(nsIEmbeddingSiteWindow)
   NS_INTERFACE_MAP_ENTRY(nsITooltipListener)
   NS_INTERFACE_MAP_ENTRY(nsIPrompt)
@@ -232,6 +233,20 @@ EmbedWindow::ExitModalEventLoop(nsresult aStatus)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+// nsIWebBrowserChromeFocus
+
+NS_IMETHODIMP
+EmbedWindow::FocusNextElement()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+EmbedWindow::FocusPrevElement()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 // nsIEmbeddingSiteWindow
 
 NS_IMETHODIMP
diff --git a/mozilla/embedding/browser/gtk/src/EmbedWindow.h b/mozilla/embedding/browser/gtk/src/EmbedWindow.h
index 0e77542806d..4523102eeea 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedWindow.h
+++ b/mozilla/embedding/browser/gtk/src/EmbedWindow.h
@@ -23,6 +23,7 @@
 #define __EmbedWindow_h
 
 #include <nsIWebBrowserChrome.h>
+#include <nsIWebBrowserChromeFocus.h>
 #include <nsIEmbeddingSiteWindow.h>
 #include <nsITooltipListener.h>
 #include <nsIPrompt.h>
@@ -37,6 +38,7 @@
 class EmbedPrivate;
 
 class EmbedWindow : public nsIWebBrowserChrome,
+		    public nsIWebBrowserChromeFocus,
                     public nsIEmbeddingSiteWindow,
                     public nsITooltipListener,
                     public nsIPrompt,
@@ -56,6 +58,8 @@ class EmbedWindow : public nsIWebBrowserChrome,
 
   NS_DECL_NSIWEBBROWSERCHROME
 
+  NS_DECL_NSIWEBBROWSERCHROMEFOCUS
+
   NS_DECL_NSIEMBEDDINGSITEWINDOW
 
   NS_DECL_NSITOOLTIPLISTENER
diff --git a/mozilla/embedding/browser/macbuild/browserIDL.mcp b/mozilla/embedding/browser/macbuild/browserIDL.mcp
index b693a766b82..ade7b02ef18 100644
Binary files a/mozilla/embedding/browser/macbuild/browserIDL.mcp and b/mozilla/embedding/browser/macbuild/browserIDL.mcp differ
diff --git a/mozilla/embedding/browser/photon/src/PhMozEmbedChrome.cpp b/mozilla/embedding/browser/photon/src/PhMozEmbedChrome.cpp
index 959303ddac8..7a748fcc670 100644
--- a/mozilla/embedding/browser/photon/src/PhMozEmbedChrome.cpp
+++ b/mozilla/embedding/browser/photon/src/PhMozEmbedChrome.cpp
@@ -782,8 +782,9 @@ NS_IMETHODIMP PhMozEmbedChrome::SetFocus(void)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP PhMozEmbedChrome::FocusAvailable(nsIBaseWindow *aCurrentFocus, 
-						PRBool *aTookFocus)
+NS_IMETHODIMP PhMozEmbedChrome::FocusAvailable(nsIBaseWindow *aCurrentFocus,
+					       PRBool aForward,
+					       PRBool *aTookFocus)
 {
   PR_LOG(mozEmbedLm, PR_LOG_DEBUG, ("PhMozEmbedChrome::FocusAvailable\n"));
   return NS_ERROR_NOT_IMPLEMENTED;
diff --git a/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.cpp b/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.cpp
index 021999e3d91..b324277e4c5 100644
--- a/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.cpp
+++ b/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.cpp
@@ -227,6 +227,20 @@ NS_IMETHODIMP CWebBrowserChrome::ExitModalEventLoop(nsresult aStatus)
    return NS_OK;
 }
 
+//*****************************************************************************
+// CWebBrowserChrome::nsIWebBrowserChromeFocus
+//*****************************************************************************
+
+NS_IMETHODIMP CWebBrowserChrome::FocusNextElement()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP CWebBrowserChrome::FocusPrevElement()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 //*****************************************************************************
 // CWebBrowserChrome::nsIWebProgressListener
 //*****************************************************************************   
diff --git a/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.h b/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.h
index 655f39db20d..ba4b7a6859b 100644
--- a/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.h
+++ b/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.h
@@ -1,4 +1,4 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * The contents of this file are subject to the Mozilla Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -29,6 +29,7 @@
 
 // Interfaces Needed
 #include "nsIWebBrowserChrome.h"
+#include "nsIWebBrowserChromeFocus.h"
 #include "nsIWebProgressListener.h"
 #include "nsIEmbeddingSiteWindow.h"
 #include "nsIInterfaceRequestor.h"
@@ -44,18 +45,20 @@ class CBrowserWindow;
 class CBrowserShell;
 
 class CWebBrowserChrome : public nsIWebBrowserChrome,
-                           public nsIWebProgressListener,
-                           public nsIEmbeddingSiteWindow,
-                           public nsIInterfaceRequestor,
-                           public nsIContextMenuListener,
-                           public nsITooltipListener,
-                           public nsSupportsWeakReference
+                          public nsIWebBrowserChromeFocus,
+                          public nsIWebProgressListener,
+                          public nsIEmbeddingSiteWindow,
+                          public nsIInterfaceRequestor,
+                          public nsIContextMenuListener,
+                          public nsITooltipListener,
+                          public nsSupportsWeakReference
 {
 friend class CBrowserWindow;
 
 public:
    NS_DECL_ISUPPORTS
    NS_DECL_NSIWEBBROWSERCHROME
+   NS_DECL_NSIWEBBROWSERCHROMEFOCUS
    NS_DECL_NSIWEBPROGRESSLISTENER
    NS_DECL_NSIEMBEDDINGSITEWINDOW
    NS_DECL_NSIINTERFACEREQUESTOR
diff --git a/mozilla/embedding/browser/webBrowser/MANIFEST_IDL b/mozilla/embedding/browser/webBrowser/MANIFEST_IDL
index f43334b563e..142a48315f5 100644
--- a/mozilla/embedding/browser/webBrowser/MANIFEST_IDL
+++ b/mozilla/embedding/browser/webBrowser/MANIFEST_IDL
@@ -23,6 +23,7 @@
 nsCWebBrowser.idl
 nsIWebBrowser.idl
 nsIWebBrowserChrome.idl
+nsIWebBrowserChromeFocus.idl
 nsIWebBrowserSetup.idl
 nsIEmbeddingSiteWindow.idl
 nsIWebBrowserPersist.idl
diff --git a/mozilla/embedding/browser/webBrowser/Makefile.in b/mozilla/embedding/browser/webBrowser/Makefile.in
index bad89469ca3..430a7e05569 100644
--- a/mozilla/embedding/browser/webBrowser/Makefile.in
+++ b/mozilla/embedding/browser/webBrowser/Makefile.in
@@ -34,6 +34,7 @@ XPIDLSRCS	= \
 		nsCWebBrowser.idl			\
 		nsIWebBrowser.idl			\
 		nsIWebBrowserChrome.idl			\
+		nsIWebBrowserChromeFocus.idl		\
 		nsIWebBrowserSetup.idl			\
 		nsICommandHandler.idl			\
 		nsIContextMenuListener.idl		\
diff --git a/mozilla/embedding/browser/webBrowser/makefile.win b/mozilla/embedding/browser/webBrowser/makefile.win
index ceecf94b4ee..2cd7f4740d1 100644
--- a/mozilla/embedding/browser/webBrowser/makefile.win
+++ b/mozilla/embedding/browser/webBrowser/makefile.win
@@ -28,6 +28,7 @@ XPIDLSRCS=                        \
     .\nsCWebBrowser.idl            \
     .\nsIWebBrowser.idl            \
     .\nsIWebBrowserChrome.idl      \
+    .\nsIWebBrowserChromeFocus.idl \
     .\nsICommandHandler.idl        \
     .\nsIWebBrowserSetup.idl       \
     .\nsIWebBrowserPersist.idl     \
diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
index 01616f9778a..816ee2058a6 100644
--- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
+++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
@@ -57,6 +57,7 @@
 #include "nsPIWindowWatcher.h"
 #include "nsIPrompt.h"
 #include "nsIWalletService.h"
+#include "nsIWebBrowserChromeFocus.h"
 
 static char *sWindowWatcherContractID = "@mozilla.org/embedcomp/window-watcher;1";
 
@@ -112,6 +113,9 @@ NS_IMETHODIMP nsDocShellTreeOwner::GetInterface(const nsIID& aIID, void** aSink)
   if(NS_SUCCEEDED(QueryInterface(aIID, aSink)))
     return NS_OK;
 
+  if (aIID.Equals(NS_GET_IID(nsIWebBrowserChromeFocus)))
+    return mOwnerWin->QueryInterface(aIID, aSink);
+
   if (aIID.Equals(NS_GET_IID(nsIPrompt))) {
     nsIPrompt *prompt;
     EnsurePrompter();
@@ -617,8 +621,9 @@ NS_IMETHODIMP nsDocShellTreeOwner::SetFocus()
     return NS_ERROR_NULL_POINTER;
 }
 
-NS_IMETHODIMP nsDocShellTreeOwner::FocusAvailable(nsIBaseWindow* aCurrentFocus, 
-   PRBool* aTookFocus)
+NS_IMETHODIMP nsDocShellTreeOwner::FocusAvailable(nsIBaseWindow* aCurrentFocus,
+                                                  PRBool aForward,
+                                                  PRBool* aTookFocus)
 {
     return NS_ERROR_NULL_POINTER;
 }
diff --git a/mozilla/embedding/browser/webBrowser/nsIWebBrowserChromeFocus.idl b/mozilla/embedding/browser/webBrowser/nsIWebBrowserChromeFocus.idl
new file mode 100644
index 00000000000..b3a95c0fc33
--- /dev/null
+++ b/mozilla/embedding/browser/webBrowser/nsIWebBrowserChromeFocus.idl
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 0 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications, Inc.  Portions created by Netscape are
+ * Copyright (C) 1999, Mozilla.  All Rights Reserved.
+ * 
+ * Original Author:
+ *   Dan Rosen <dr@netscape.com>
+ * Contributor(s):
+ *
+ */
+
+#include "nsISupports.idl"
+
+/**
+ * The nsIWebBrowserChromeFocus is implemented by the same object as the
+ * nsIWebBrowserSiteWindow. It represents the focus up-calls from mozilla
+ * to the embedding chrome. See mozilla bug #70224 for gratuitous info.
+ *
+ * @status UNDER_REVIEW
+ */
+
+[scriptable, uuid(d2206418-1dd1-11b2-8e55-acddcd2bcfb8)]
+interface nsIWebBrowserChromeFocus : nsISupports
+{
+    /**
+     * Set the focus at the next focusable element in the chrome
+     */
+
+    void focusNextElement();
+
+    /**
+     * Set the focus at the previous focusable element in the chrome
+     */
+
+    void focusPrevElement();
+
+};
diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
index bb1672a2da0..71b65d2aa2c 100644
--- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
+++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
@@ -1191,7 +1191,8 @@ NS_IMETHODIMP nsWebBrowser::SetFocus()
 }
 
 NS_IMETHODIMP nsWebBrowser::FocusAvailable(nsIBaseWindow* aCurrentFocus,
-   PRBool* aTookFocus)
+                                           PRBool aForward,
+                                           PRBool* aTookFocus)
 {
    NS_ENSURE_ARG_POINTER(aTookFocus);
 
@@ -1205,7 +1206,8 @@ NS_IMETHODIMP nsWebBrowser::FocusAvailable(nsIBaseWindow* aCurrentFocus,
    if(aCurrentFocus == NS_STATIC_CAST(nsIBaseWindow*, this))
       {
       if(nextCallWin)
-         return nextCallWin->FocusAvailable(aCurrentFocus, aTookFocus);
+         return nextCallWin->FocusAvailable(aCurrentFocus,
+                                            aForward, aTookFocus);
       return NS_OK;
       }
 
diff --git a/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.cpp b/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.cpp
index 570654589f2..0b5a0f25505 100644
--- a/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.cpp
+++ b/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.cpp
@@ -59,6 +59,7 @@ NS_INTERFACE_MAP_BEGIN(WebBrowserChrome)
    NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebBrowserChrome)
    NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
    NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome)
+   NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChromeFocus)
    NS_INTERFACE_MAP_ENTRY(nsIEmbeddingSiteWindow)
    NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener)  //optional
 //   NS_INTERFACE_MAP_ENTRY(nsIPrompt)
@@ -207,6 +208,19 @@ NS_IMETHODIMP WebBrowserChrome::ExitModalEventLoop(nsresult aStatus)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+//*****************************************************************************
+// WebBrowserChrome::nsIWebBrowserChromeFocus
+//*****************************************************************************
+
+NS_IMETHODIMP WebBrowserChrome::FocusNextElement()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP WebBrowserChrome::FocusPrevElement()
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
 
 //*****************************************************************************
 // WebBrowserChrome::nsIWebProgressListener
@@ -306,4 +320,3 @@ NS_IMETHODIMP WebBrowserChrome::GetSiteWindow(void ** aSiteWindow)
    *aSiteWindow = mNativeWindow;
    return NS_OK;
 }
-
diff --git a/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.h b/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.h
index 7c45ecce45e..dc49fd6ca35 100644
--- a/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.h
+++ b/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.h
@@ -1,4 +1,4 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * The contents of this file are subject to the Mozilla Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -26,6 +26,7 @@
 #include "nsIGenericFactory.h"
 #include "nsString.h"
 #include "nsIWebBrowserChrome.h"
+#include "nsIWebBrowserChromeFocus.h"
 
 #include "nsIDocShell.h"
 #include "nsIContentViewer.h"
@@ -40,8 +41,8 @@
 #include "nsVoidArray.h"
 
 
-
 class WebBrowserChrome   : public nsIWebBrowserChrome,
+                           public nsIWebBrowserChromeFocus, 
                            public nsIWebProgressListener,
                            public nsIEmbeddingSiteWindow,
 //                           public nsIPrompt,
@@ -56,6 +57,7 @@ public:
     NS_DECL_NSIWEBBROWSERCHROME
     NS_DECL_NSIWEBPROGRESSLISTENER
     NS_DECL_NSIEMBEDDINGSITEWINDOW
+    NS_DECL_NSIWEBBROWSERCHROMEFOCUS
     //   NS_DECL_NSIPROMPT
     NS_DECL_NSIINTERFACEREQUESTOR
 
diff --git a/mozilla/embedding/tests/mfcembed/BrowserImpl.cpp b/mozilla/embedding/tests/mfcembed/BrowserImpl.cpp
index 10de6cf98c5..f3e54aae28a 100644
--- a/mozilla/embedding/tests/mfcembed/BrowserImpl.cpp
+++ b/mozilla/embedding/tests/mfcembed/BrowserImpl.cpp
@@ -104,6 +104,7 @@ NS_INTERFACE_MAP_BEGIN(CBrowserImpl)
    NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebBrowserChrome)
    NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
    NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome)
+   NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChromeFocus)
    NS_INTERFACE_MAP_ENTRY(nsIEmbeddingSiteWindow)
    NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener)
    NS_INTERFACE_MAP_ENTRY(nsIContextMenuListener)
@@ -240,6 +241,20 @@ NS_IMETHODIMP CBrowserImpl::ExitModalEventLoop(nsresult aStatus)
   return NS_OK;
 }
 
+//*****************************************************************************
+// CBrowserImpl::nsIWebBrowserChromeFocus
+//*****************************************************************************
+
+NS_IMETHODIMP CBrowserImpl::FocusNextElement()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP CBrowserImpl::FocusPrevElement()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 //*****************************************************************************
 // CBrowserImpl::nsIEmbeddingSiteWindow
 //*****************************************************************************   
diff --git a/mozilla/embedding/tests/mfcembed/BrowserImpl.h b/mozilla/embedding/tests/mfcembed/BrowserImpl.h
index b974b18dc69..5cd74546a38 100644
--- a/mozilla/embedding/tests/mfcembed/BrowserImpl.h
+++ b/mozilla/embedding/tests/mfcembed/BrowserImpl.h
@@ -25,9 +25,11 @@
 #define _BROWSERIMPL_H
 
 #include "IBrowserFrameGlue.h"
+#include "nsIWebBrowserChromeFocus.h"
 
 class CBrowserImpl : public nsIInterfaceRequestor,
 					 public nsIWebBrowserChrome,
+                     public nsIWebBrowserChromeFocus,
 					 public nsIEmbeddingSiteWindow,
 					 public nsIWebProgressListener,
 					 public nsIContextMenuListener,
@@ -42,6 +44,7 @@ public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIINTERFACEREQUESTOR
     NS_DECL_NSIWEBBROWSERCHROME
+    NS_DECL_NSIWEBBROWSERCHROMEFOCUS
     NS_DECL_NSIEMBEDDINGSITEWINDOW
     NS_DECL_NSIWEBPROGRESSLISTENER
     NS_DECL_NSICONTEXTMENULISTENER
diff --git a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp
index 31e93d41a60..4e192ee8651 100644
--- a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp
+++ b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp
@@ -251,6 +251,20 @@ NS_IMETHODIMP WebBrowserChrome::ExitModalEventLoop(nsresult aStatus)
   return NS_OK;
 }
 
+//*****************************************************************************
+// WebBrowserChrome::nsIWebBrowserChromeFocus
+//*****************************************************************************
+
+NS_IMETHODIMP WebBrowserChrome::FocusNextElement()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP WebBrowserChrome::FocusPrevElement()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 //*****************************************************************************
 // WebBrowserChrome::nsIWebProgressListener
 //*****************************************************************************   
diff --git a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.h b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.h
index d2e500d2af2..038f00c98eb 100644
--- a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.h
+++ b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.h
@@ -1,4 +1,4 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * The contents of this file are subject to the Mozilla Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -26,6 +26,7 @@
 #include "nsIGenericFactory.h"
 #include "nsString.h"
 #include "nsIWebBrowserChrome.h"
+#include "nsIWebBrowserChromeFocus.h"
 
 #include "nsIDocShell.h"
 #include "nsIContentViewer.h"
@@ -61,6 +62,7 @@ public:
 };
 
 class WebBrowserChrome   : public nsIWebBrowserChrome,
+                           public nsIWebBrowserChromeFocus,
                            public nsIWebProgressListener,
                            public nsIEmbeddingSiteWindow,
                            public nsIInterfaceRequestor,
@@ -77,6 +79,7 @@ public:
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIWEBBROWSERCHROME
+    NS_DECL_NSIWEBBROWSERCHROMEFOCUS
     NS_DECL_NSIWEBPROGRESSLISTENER
     NS_DECL_NSIEMBEDDINGSITEWINDOW
     NS_DECL_NSIINTERFACEREQUESTOR
diff --git a/mozilla/gfx/src/gtk/scale.c b/mozilla/gfx/src/gtk/scale.c
index 26368544fb4..32f39688614 100644
--- a/mozilla/gfx/src/gtk/scale.c
+++ b/mozilla/gfx/src/gtk/scale.c
@@ -25,6 +25,7 @@
 #include "drawers.h"
 
 #include <stdio.h>
+#include <string.h>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
@@ -43,20 +44,26 @@ NNScaleImage(Display *display, XImage *img,
   PRUint32 size;
   char *data;
 
-  size = newWidth * newHeight * img->depth;
-  data = (char *) PR_Malloc(size); 
-
-  if (!data) {
-    return (XImage *) NULL;
-  }
 
   newImg = XCreateImage(display, DefaultVisual(display, 0),
                         img->depth,
                         img->format,
                         0, 0, newWidth, newHeight,
                         img->bitmap_pad, 0);
+
+  if (!newImg) {
+    return NULL;
+  }
+
+  size = newHeight * newImg->bytes_per_line;
+  data = (char *) PR_Malloc(size); 
   newImg->data = data;
 
+  if (!data) {
+    XDestroyImage(newImg);
+    return NULL;
+  }
+
   if (factorX == 1) {
     /* an obvious optimization is to bypass XPutPixel 
        and to memcpy rows in img->data if factorX is 1
@@ -70,8 +77,8 @@ NNScaleImage(Display *display, XImage *img,
     for (i = 0; i < newHeight; i++) {
       ysrc = (PRInt16) (i * factorY);
       sptr = img->data + ysrc * rowsize;
-      memcpy(dptr, sptr, rowsize);
-      dptr += rowsize;
+      memcpy(dptr, sptr, PR_MIN(rowsize, newImg->bytes_per_line));
+      dptr += newImg->bytes_per_line;
     }
   } else {
     for (i = 0; i < newWidth; i++) {
diff --git a/mozilla/gfx/src/mac/nsDeviceContextMac.cpp b/mozilla/gfx/src/mac/nsDeviceContextMac.cpp
index d64a3dc050b..f77797bd3b3 100644
--- a/mozilla/gfx/src/mac/nsDeviceContextMac.cpp
+++ b/mozilla/gfx/src/mac/nsDeviceContextMac.cpp
@@ -159,8 +159,14 @@ NS_IMETHODIMP nsDeviceContextMac :: SupportsNativeWidgets(PRBool &aSupportsWidge
   // Raptor currently doesn't work this way and needs to be fixed.
   // (please remove this comment when this situation is rectified)
   
+  if( nsnull != mSpec){
+  	aSupportsWidgets = PR_FALSE;
+  } else {
+  	aSupportsWidgets = PR_TRUE;
+  }
+  
   //if (nsnull == mSurface)
-    aSupportsWidgets = PR_TRUE;
+    
   //else
    //aSupportsWidgets = PR_FALSE;
 
diff --git a/mozilla/gfx/src/nsPrintOptionsImpl.cpp b/mozilla/gfx/src/nsPrintOptionsImpl.cpp
index d654fbc8194..769b2a97352 100644
--- a/mozilla/gfx/src/nsPrintOptionsImpl.cpp
+++ b/mozilla/gfx/src/nsPrintOptionsImpl.cpp
@@ -103,7 +103,7 @@ nsPrintOptions::nsPrintOptions() :
   mPrintInColor(PR_TRUE),
   mPaperSize(kLetterPaperSize),
   mPrintToFile(PR_FALSE),
-  mPrintFrameType(kSelectedFrame),
+  mPrintFrameType(kFramesAsIs),
   mHowToEnableFrameUI(kFrameEnableNone),
   mPageNumJust(kJustLeft),
   mIsCancelled(PR_FALSE),
diff --git a/mozilla/js/landbranch.pl b/mozilla/js/landbranch.pl
new file mode 100755
index 00000000000..369b74d43e0
--- /dev/null
+++ b/mozilla/js/landbranch.pl
@@ -0,0 +1,227 @@
+#! /usr/local/bin/perl5
+
+use File::Path;
+
+# The development branch is where primary development and checkins
+# are done on a day-to-day basis.
+$development_branch_prefix = "SpiderMonkey140";
+
+# Space-separated list of CVS-controlled directories to tag/merge
+$merge_dirs =
+    "mozilla/js/src " ;
+
+# When line below uncommented, don't recurse into subdirs
+#$recurse_flag = '-l';
+
+#----------------------------------------------------------------------------
+
+# The merge branch is itself a branch off of the development branch
+# at a point where the development branch is thought to be stable.
+# (A branch is used rather than a static tag because, inevitably,
+# the development branch is not quite as stable/buildable as was
+# thought.)  The contents of the merge branch will be copied to
+# the trunk when merging takes place.
+
+
+# The following tags are created automatically by this script:
+#
+# JS_STABLE_DROP
+#
+#     A static tag on the development branch (or a branch off the
+#     development branch) that indicates the code that should be merged
+#     into the trunk.  This is a "variable" tag in the sense that it is
+#     redefined after each merge.
+#
+# JS_LAST_STABLE_DROP
+#
+#     A static tag that is a copy of what the JS_STABLE_DROP tag was in
+#     the previous merge cycle.  This is a "variable" tag that is
+#     redefined after each merge.  Changes in the branch can be merged
+#     to the trunk by using:
+#
+#         cvs up -jJS_LAST_STABLE_DROP -jJS_STABLE_DROP
+#
+# JS_LANDING
+#
+#     A static tag that identifies the code on the trunk after the merge
+#     from the branch to the trunk takes place.  This is a "variable"
+#     tag that is redefined after each merge.  Changes on the trunk
+#     since the last branch landing can be seen by using:
+#
+#         cvs diff -rJS_LANDING -rHEAD
+#
+# JS_LANDING_mmddyyyy
+#
+#     This is a tag on the trunk which may be used for archaeological
+#     purposes.  This tag is made from the JS_LANDING tag.
+
+
+$development_branch = $development_branch_prefix . "_BRANCH";
+$development_base = $development_branch_prefix . "_BASE";
+
+sub help {
+print <<"END";
+$0: A tool for merging stable snapshots of JavaScript from a CVS
+development branch onto the trunk
+
+Landing a snapshot of the development branch consists of
+the following steps:
+
+  1) Tag all/some files on the branch to identify files to be merged.
+  2) Merge files from the branch into the trunk using a temporary
+     working directory.
+  3) Resolve any conflicts that arise as a result of the merge.
+  4) Commit merged changes to the trunk.
+  5) Make changes to resolve (build) difficulties and re-commit.
+     Repeat as necessary.
+  6) Backpropagate changes on the trunk to the development branch.
+  
+This script will assist with steps #2, #4 and #6:
+
+  $0 -merge JS_STABLE_10131998
+  $0 -commit
+  $0 -backpatch
+  
+END
+}
+
+sub log {
+    local($msg) = @_;
+    print LOGFILE $msg if $logfile;
+}
+
+# Similar to die built-in
+sub die {
+    local($msg) = @_;
+    &log($msg);
+    chomp($msg);
+    if ($logfile) {
+	$msg .= "\nSee $logfile for details.";
+    }
+    die "$msg\n";
+}
+
+# Similar to system() built-in
+sub system {
+    local(@args) = @_;
+    local($cmd) = join(" ", @args);
+    &log("Executing: $cmd\n");
+
+    if ($logfile) {
+	$cmd .= " >> $logfile 2>&1";
+	close(LOGFILE);
+    }
+
+    local($result) = 0xffff & system($cmd);
+
+    if ($logfile) {
+	open(LOGFILE, ">>$logfile");
+    }
+
+    return unless ($result);
+    $msg = "Died while executing $cmd";
+
+    if ($result == 0xff00) {
+	&die("$msg\nWhile executExecution failed due to perl error: $!. ");
+    } else {
+	$result >>= 8;
+	&die("$msg\nExecution failed; exit status: $result. ");
+    }
+}
+
+chomp($root_dir = `pwd`);
+
+# Default log file
+$logfile = $root_dir . "/log";
+
+while ($#ARGV >=0) {
+    $_ = shift;
+ 
+    if (/-merge/) {
+	$do_tag = 1;
+	$do_checkout = 1;
+	$do_merge = 1;
+	$tag = shift;
+    } elsif (/-commit/ || /-ci/) {
+	$do_commit = 1;
+    } elsif (/-backpatch/) {
+	$do_backpatch = 1;
+    } elsif (/-log/) {
+	$logfile = shift;
+    } elsif (/-tag/) { # Debugging option
+	$do_tag = 1;
+	$tag = shift;
+    } elsif (/-co/) {  # Debugging option
+	$do_checkout = 1;
+    } else {
+	print STDERR "Illegal option: $_\n" unless (/-h/);
+	&help();
+	exit(1);
+    }
+}
+
+die "You must set your CVSROOT environment variable" if !$ENV{"CVSROOT"};
+
+if ($logfile) {
+    open(LOGFILE, ">$logfile") || die "Couldn't open log file \"$logfile\"";
+    print("Logging to file \"$logfile\".\n");
+}
+
+$trunk_dir = $root_dir . "/trunk";
+
+if ($do_tag) {
+    if (!$tag) {
+	&die("Must specify tag on command-line\n");
+    }
+
+    print("Tagging tree with tag JS_STABLE_DROP.\n");
+    &system("cvs rtag $recurse_flag -F -r $tag JS_STABLE_DROP $merge_dirs");
+}
+
+if ($do_checkout) {
+
+    # Delete trunk subdir if it already exists
+    if (-d $trunk_dir) {
+	&log("Deleting directory $trunk_dir\n");
+	rmtree ($trunk_dir, 0, 1);
+    }
+    &log("Creating directory $trunk_dir\n");
+    mkdir($trunk_dir, 0777) || die "Couldn't create directory $trunk_dir";
+
+    # Check out on trunk
+    print("Checking out $merge_dirs.\n");
+    chdir $trunk_dir;
+    &system("cvs co $recurse_flag -A $merge_dirs");
+}
+
+if ($do_merge) {
+    chdir $trunk_dir;
+    print("Merging from JS_STABLE_DROP into trunk\n");
+    &system("cvs up -jJS_LAST_STABLE_DROP -jJS_STABLE_DROP");
+}
+
+if ($do_commit) {
+    &die("No merged tree found.  Wrong directory ?") if (!chdir $trunk_dir);
+
+    ($_,$_,$_,$day,$mon,$year,$_,$_) = localtime(time());
+    if ($year < 30) {
+	$year = "20" . $year;
+    } else {
+	$year = "19" . $year;
+    }
+
+    $mmddyyyy = sprintf("%02d%02d%s", $mon, $day, $year);
+
+    print("Checking in code on trunk");
+    &system("cvs ci -m 'Stable drop of JavaScript interpreter code from " .
+	    "$development_branch'");
+
+    # Tag merged result
+    &system("cvs tag -F JS_LANDING");
+    &system("cvs tag -F JS_LANDING_$mmddyyyy");
+
+    # Move JS_LAST_STABLE_DROP tag forward
+    &system("cvs tag -F -rJS_STABLE_DROP JS_LAST_STABLE_DROP");
+}
+    
+    
diff --git a/mozilla/layout/build/nsLayoutCID.h b/mozilla/layout/build/nsLayoutCID.h
index 7e03e06cea0..f37bfe368a9 100644
--- a/mozilla/layout/build/nsLayoutCID.h
+++ b/mozilla/layout/build/nsLayoutCID.h
@@ -231,4 +231,8 @@
 #define NS_PLAINTEXTSERIALIZER_CID \
 { 0x6030f7ef, 0x32ed, 0x46a7, { 0x9a, 0x63, 0x6a, 0x5d, 0x3f, 0x90, 0x44, 0x5f } }
 
+// {5C5AF390-34BE-11d5-A03B-0010A4EF48C9}
+#define NS_LAYOUT_HISTORY_STATE_CID \
+{ 0x5c5af390, 0x34be, 0x11d5, { 0xa0, 0x3b, 0x00, 0x10, 0xa4, 0xef, 0x48, 0xc9 } }
+
 #endif /* nsLayoutCID_h__ */
diff --git a/mozilla/layout/build/nsLayoutFactory.cpp b/mozilla/layout/build/nsLayoutFactory.cpp
index c4305fe3bd3..66adcbae94d 100644
--- a/mozilla/layout/build/nsLayoutFactory.cpp
+++ b/mozilla/layout/build/nsLayoutFactory.cpp
@@ -88,6 +88,7 @@ static NS_DEFINE_CID(kIFrameBoxObjectCID, NS_IFRAMEBOXOBJECT_CID);
 static NS_DEFINE_CID(kOutlinerBoxObjectCID, NS_OUTLINERBOXOBJECT_CID);
 
 static NS_DEFINE_CID(kAutoCopyServiceCID, NS_AUTOCOPYSERVICE_CID);
+static NS_DEFINE_CID(kLayoutHistoryStateCID, NS_LAYOUT_HISTORY_STATE_CID);
 
 extern nsresult NS_NewLayoutDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult);
 #ifdef NS_DEBUG
@@ -115,6 +116,7 @@ extern nsresult NS_NewPrintContext(nsIPrintContext** aResult);
 
 extern nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult);
 extern nsresult NS_CreateCSSFrameConstructor(nsICSSFrameConstructor** aResult);
+extern nsresult NS_NewLayoutHistoryState(nsILayoutHistoryState** aResult);
 
 //----------------------------------------------------------------------
 
@@ -314,6 +316,13 @@ nsLayoutFactory::CreateInstance(nsISupports *aOuter,
       return res;
     }
   }
+  else if (mClassID.Equals(kLayoutHistoryStateCID)) {
+    res = NS_NewLayoutHistoryState((nsILayoutHistoryState**) &inst);
+    if (NS_FAILED(res)) {
+      LOG_NEW_FAILURE("NS_NewLayoutHistoryState", res);
+      return res;
+    }
+  }
   else {
     return NS_NOINTERFACE;
   }
diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp
index 876cce33bf9..fd09fbf0ae2 100644
--- a/mozilla/layout/build/nsLayoutModule.cpp
+++ b/mozilla/layout/build/nsLayoutModule.cpp
@@ -324,6 +324,7 @@ static Components gComponents[] = {
 
   { "CSS Frame Constructor", NS_CSSFRAMECONSTRUCTOR_CID, nsnull, },
   { "Frame Traversal", NS_FRAMETRAVERSAL_CID, nsnull, },
+  { "Layout History State", NS_LAYOUT_HISTORY_STATE_CID, nsnull, },
 
   // XXX ick
   { "Presentation shell", NS_PRESSHELL_CID, nsnull, },
diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp
index 39473fea05c..407cba19903 100644
--- a/mozilla/layout/html/base/src/nsFrame.cpp
+++ b/mozilla/layout/html/base/src/nsFrame.cpp
@@ -3984,6 +3984,28 @@ nsFrame::IsMouseCaptured(nsIPresContext* aPresContext)
   return PR_FALSE;
 }
 
+void
+nsFrame::SetDefaultBackgroundColor(nsIPresContext* aPresContext)
+{
+  nsCOMPtr<nsIPresShell> shell;
+  aPresContext->GetShell(getter_AddRefs(shell));
+
+  if (shell) {
+    nsCOMPtr<nsIViewManager> vm;
+    shell->GetViewManager(getter_AddRefs(vm));
+
+    if (vm) {
+      nsStyleColor color;
+      mStyleContext->GetStyle(eStyleStruct_Color, color);
+
+      vm->SetDefaultBackgroundColor(
+          (color.mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT) == 0
+             ? color.mBackgroundColor
+             : NS_RGBA(0, 0, 0, 0));
+    }
+  }
+}
+
 #ifdef IBMBIDI
 /**
  *  retrieve Bidi property of this frame
diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h
index 93dbb1cc0dd..225c23502c9 100644
--- a/mozilla/layout/html/base/src/nsFrame.h
+++ b/mozilla/layout/html/base/src/nsFrame.h
@@ -464,6 +464,10 @@ protected:
 
   static void XMLQuote(nsString& aString);
 
+  // Helper function that sets the view manager's default background to be
+  // the background of this frame.
+  void SetDefaultBackgroundColor(nsIPresContext* aPresContext);
+
   virtual PRBool ParentDisablesSelection() const;
 
   // Set the overflow clip rect into the rendering-context. Used for block-level
diff --git a/mozilla/layout/html/base/src/nsFrameManager.cpp b/mozilla/layout/html/base/src/nsFrameManager.cpp
index 2987f7da417..018822c9631 100644
--- a/mozilla/layout/html/base/src/nsFrameManager.cpp
+++ b/mozilla/layout/html/base/src/nsFrameManager.cpp
@@ -1030,26 +1030,23 @@ FrameManager::CantRenderReplacedElement(nsIPresContext* aPresContext,
 #ifdef NOISY_EVENTS
   printf("%p FrameManager::CantRenderReplacedElement called\n", this);
 #endif
-  nsIEventQueueService* eventService;
-  nsresult              rv;
 
   // We need to notify the style stystem, but post the notification so it
   // doesn't happen now
-  rv = nsServiceManager::GetService(kEventQueueServiceCID,
-                                    NS_GET_IID(nsIEventQueueService),
-                                    (nsISupports **)&eventService);
-  if (NS_SUCCEEDED(rv)) {
+  nsresult rv;
+  nsCOMPtr<nsIEventQueueService> eventService = do_GetService(kEventQueueServiceCID, &rv);
+
+  if (eventService) {
     nsCOMPtr<nsIEventQueue> eventQueue;
     rv = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, 
                                            getter_AddRefs(eventQueue));
-    nsServiceManager::ReleaseService(kEventQueueServiceCID, eventService);
 
     if (NS_SUCCEEDED(rv) && eventQueue) {
-#ifdef NS_DEBUG
       // Verify that there isn't already a posted event associated with
-      // this frame
-      NS_ASSERTION(!*FindPostedEventFor(aFrame), "frame already has posted event");
-#endif
+      // this frame.
+      if (*FindPostedEventFor(aFrame))
+        return NS_OK;
+
       CantRenderReplacedElementEvent* ev;
 
       // Create a new event
diff --git a/mozilla/layout/html/base/src/nsHTMLFrame.cpp b/mozilla/layout/html/base/src/nsHTMLFrame.cpp
index cdcb4912c11..1f795edd988 100644
--- a/mozilla/layout/html/base/src/nsHTMLFrame.cpp
+++ b/mozilla/layout/html/base/src/nsHTMLFrame.cpp
@@ -85,6 +85,11 @@ public:
     return NS_OK;
   }
 
+  NS_IMETHOD Paint(nsIPresContext* aPresContext,
+                   nsIRenderingContext& aRenderingContext,
+                   const nsRect& aDirtyRect,
+                   nsFramePaintLayer aWhichLayer);
+
   /**
    * Get the "type" of the frame
    *
@@ -220,6 +225,18 @@ CanvasFrame::RemoveFrame(nsIPresContext* aPresContext,
   return rv;
 }
 
+NS_IMETHODIMP
+CanvasFrame::Paint(nsIPresContext* aPresContext,
+                   nsIRenderingContext& aRenderingContext,
+                   const nsRect& aDirtyRect,
+                   nsFramePaintLayer aWhichLayer)
+{
+  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) {
+    SetDefaultBackgroundColor(aPresContext);
+  }
+  return nsHTMLContainerFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
+}
+
 NS_IMETHODIMP
 CanvasFrame::Reflow(nsIPresContext*          aPresContext,
                     nsHTMLReflowMetrics&     aDesiredSize,
diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp
index e8ed3618c81..56aa5cba0e5 100644
--- a/mozilla/layout/html/base/src/nsObjectFrame.cpp
+++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp
@@ -89,7 +89,6 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
 #undef KeyPress
 #endif
 
-#define NATIVE_ERROR 05
 
 class nsPluginInstanceOwner : public nsIPluginInstanceOwner,
                               public nsIPluginTagInfo2,
@@ -1401,6 +1400,18 @@ nsObjectFrame::HandleEvent(nsIPresContext* aPresContext,
   //FIX FOR CRASHING WHEN NO INSTANCE OWVER
   if (!mInstanceOwner)
     return NS_ERROR_NULL_POINTER;
+
+  if (anEvent->message == NS_PLUGIN_ACTIVATE)
+  {
+    nsCOMPtr<nsIContent> content;
+    GetContent(getter_AddRefs(content));
+    if (content)
+    {
+      content->SetFocus(aPresContext);
+      return rv;
+    }
+  }
+
 #ifdef XP_WIN
   rv = nsObjectFrameSuper::HandleEvent(aPresContext, anEvent, anEventStatus);
   return rv;
@@ -2672,7 +2683,13 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
 #ifdef XP_MAC
     if (mWidget != NULL) {  // check for null mWidget
         EventRecord* event = (EventRecord*)anEvent.nativeMsg;
-        if ((event == NULL) || (event->what == nullEvent) || ((int)event < NATIVE_ERROR)) {
+        if ((event == NULL) || (event->what == nullEvent) || 
+           (anEvent.message == NS_FOCUS_EVENT_START)      || 
+           (anEvent.message == NS_GOTFOCUS)               || 
+           (anEvent.message == NS_LOSTFOCUS)              || 
+           (anEvent.message == NS_MOUSE_MOVE)             ||
+           (anEvent.message == NS_MOUSE_ENTER))
+        {
             EventRecord macEvent;
             GUItoMacEvent(anEvent, macEvent);
             event = &macEvent;
diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp
index 2d91039f631..95a563faa19 100644
--- a/mozilla/layout/html/base/src/nsPresShell.cpp
+++ b/mozilla/layout/html/base/src/nsPresShell.cpp
@@ -3905,9 +3905,7 @@ PresShell::ScrollFrameIntoView(nsIFrame *aFrame,
         nscoord frameAlignX = frameBounds.x + (frameBounds.width * aHPercent) / 100;
         scrollOffsetX = frameAlignX - (visibleRect.width * aHPercent) / 100;
       }
-      if (scrollOffsetX != 0 || scrollOffsetY != 0) {
-        scrollingView->ScrollTo(scrollOffsetX, scrollOffsetY, NS_VMREFRESH_IMMEDIATE);
-      }
+      scrollingView->ScrollTo(scrollOffsetX, scrollOffsetY, NS_VMREFRESH_IMMEDIATE);
     }
   }
   return rv;
diff --git a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
index a926121eaac..96265e7eb8d 100644
--- a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
+++ b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
@@ -773,15 +773,19 @@ nsSimplePageSequenceFrame::PrintNextPage(nsIPresContext*  aPresContext,
 NS_IMETHODIMP
 nsSimplePageSequenceFrame::DoPageEnd(nsIPresContext*  aPresContext)
 {
+	nsresult rv = NS_OK;
+	
   if (mPrintThisPage) {
     nsCOMPtr<nsIDeviceContext> dc;
     aPresContext->GetDeviceContext(getter_AddRefs(dc));
     NS_ASSERTION(dc, "nsIDeviceContext can't be NULL!");
 
-    PRINT_DEBUG_MSG1("***************** End Page (DoPageEnd) *****************\n");
-    nsresult rv = dc->EndPage();
-    if (NS_FAILED(rv)) {
-      return rv;
+    if(mSkipPageEnd){
+	    PRINT_DEBUG_MSG1("***************** End Page (DoPageEnd) *****************\n");
+      nsresult rv = dc->EndPage();
+	    if (NS_FAILED(rv)) {
+	      return rv;
+      }
     }
   }
 
@@ -791,7 +795,12 @@ nsSimplePageSequenceFrame::DoPageEnd(nsIPresContext*  aPresContext)
   }
 
   mPageNum++;
-  return mCurrentPageFrame->GetNextSibling(&mCurrentPageFrame);
+  
+  if( nsnull != mCurrentPageFrame){
+    rv = mCurrentPageFrame->GetNextSibling(&mCurrentPageFrame);
+  }
+  
+  return rv;
 }
 
 NS_IMETHODIMP
diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp
index 02bbab90c03..106f78883ab 100644
--- a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp
@@ -655,12 +655,15 @@ NS_IMETHODIMP nsFileControlFrame::SetProperty(nsIPresContext* aPresContext,
 
 NS_IMETHODIMP nsFileControlFrame::GetProperty(nsIAtom* aName, nsAWritableString& aValue)
 {
-  // Return the value of the property from the widget it is not null.
-  // If widget is null, assume the widget is GFX-rendered and return a member variable instead.
+  aValue.Truncate();  // initialize out param
 
   if (nsHTMLAtoms::value == aName) {
-    if (mTextFrame)
+    if (mTextFrame) {
       mTextFrame->GetTextControlFrameState(aValue);
+    }
+    else if (mCachedState) {
+      aValue.Assign(*mCachedState);
+    }
   }
   return NS_OK;
 }
@@ -699,6 +702,11 @@ nsFileControlFrame::SaveState(nsIPresContext* aPresContext, nsIPresState** aStat
 {
   NS_ENSURE_ARG_POINTER(aState);
 
+  // Don't save state before we are initialized
+  if (!mTextFrame && !mCachedState) {
+    return NS_OK;
+  }
+
   // Get the value string
   nsAutoString stateString;
   nsresult res = GetProperty(nsHTMLAtoms::value, stateString);
diff --git a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
index 00338960e6a..2bf12e04fc0 100644
--- a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp
@@ -626,6 +626,11 @@ NS_IMETHODIMP nsGfxCheckboxControlFrame::SaveState(nsIPresContext* aPresContext,
 {
   NS_ENSURE_ARG_POINTER(aState);
 
+  // Don't save state before we are initialized
+  if (!mDidInit) {
+    return NS_OK;
+  }
+
   CheckState stateCheck = GetCheckboxState();
   PRBool defaultStateBool = PR_FALSE;
   nsresult res = GetDefaultCheckState(&defaultStateBool);
diff --git a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp
index 99d09cd02a5..3662fc1026f 100644
--- a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp
@@ -389,6 +389,11 @@ nsGfxRadioControlFrame::SaveState(nsIPresContext* aPresContext, nsIPresState** a
 {
   NS_ENSURE_ARG_POINTER(aState);
 
+  // Don't save state before we are initialized
+  if (!mDidInit) {
+    return NS_OK;
+  }
+
   nsresult res = NS_OK;
   PRBool stateBool = GetRadioState();
   PRBool defaultStateBool = GetDefaultChecked();
diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp
index b78431bf68e..eb496054ea4 100644
--- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp
+++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp
@@ -3087,7 +3087,7 @@ nsGfxTextControlFrame2::InvalidateCachedState()
 
 void nsGfxTextControlFrame2::GetTextControlFrameState(nsAWritableString& aValue)
 {
-  aValue.SetLength(0);  // initialize out param
+  aValue.Truncate();  // initialize out param
   
   if (mEditor && mUseEditor) 
   {
@@ -3110,7 +3110,7 @@ void nsGfxTextControlFrame2::GetTextControlFrameState(nsAWritableString& aValue)
 
     mEditor->OutputToString(aValue, NS_LITERAL_STRING("text/plain"), flags);
   }
-  else if (mCachedState && mCachedState->Length() > 0)
+  else if (mCachedState)
     aValue.Assign(*mCachedState);
 }     
 
@@ -3303,6 +3303,11 @@ nsGfxTextControlFrame2::SaveState(nsIPresContext* aPresContext, nsIPresState** a
 {
   NS_ENSURE_ARG_POINTER(aState);
 
+  // Don't save state before we are initialized
+  if (!mUseEditor) {
+    return NS_OK;
+  }
+
   // Get the value string
   nsString stateString;
   nsresult res = GetProperty(nsHTMLAtoms::value, stateString);
diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp
index 54f2d4a86df..4eed2c46566 100644
--- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp
@@ -3983,6 +3983,11 @@ nsListControlFrame::GetStateType(nsIPresContext* aPresContext,
 NS_IMETHODIMP
 nsListControlFrame::SaveStateInternal(nsIPresContext* aPresContext, nsIPresState** aState)
 {
+  // Don't save state before we are initialized
+  if (!mHasBeenInitialized) {
+    return NS_OK;
+  }
+
   PRBool saveState = PR_FALSE;
   nsresult res = NS_OK;
 
diff --git a/mozilla/layout/html/tests/block/bugs/file_list.txt b/mozilla/layout/html/tests/block/bugs/file_list.txt
index 3f25a9fc6f7..aa0bc3173ed 100644
--- a/mozilla/layout/html/tests/block/bugs/file_list.txt
+++ b/mozilla/layout/html/tests/block/bugs/file_list.txt
@@ -53,6 +53,7 @@ file:///s:/mozilla/layout/html/tests/block/bugs/13481.html
 file:///s:/mozilla/layout/html/tests/block/bugs/13553.html
 file:///s:/mozilla/layout/html/tests/block/bugs/13599.html
 file:///s:/mozilla/layout/html/tests/block/bugs/13869.html
+file:///s:/mozilla/layout/html/tests/block/bugs/14118-a.html
 file:///s:/mozilla/layout/html/tests/block/bugs/14118-b.html
 file:///s:/mozilla/layout/html/tests/block/bugs/14140.html
 file:///s:/mozilla/layout/html/tests/block/bugs/14161.html
diff --git a/mozilla/layout/html/tests/table/bugs/bug29314.html b/mozilla/layout/html/tests/table/bugs/bug29314.html
new file mode 100644
index 00000000000..24e9ebb586d
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug29314.html
@@ -0,0 +1,14 @@
+<!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/mozilla/layout/html/tests/table/bugs/bug39209.html b/mozilla/layout/html/tests/table/bugs/bug39209.html
new file mode 100644
index 00000000000..92eb8ca6ca1
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug39209.html
@@ -0,0 +1,23 @@
+<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/mozilla/layout/html/tests/table/bugs/bug43854-1.html b/mozilla/layout/html/tests/table/bugs/bug43854-1.html
new file mode 100644
index 00000000000..9ae6447f524
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug43854-1.html
@@ -0,0 +1,47 @@
+<!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/mozilla/layout/html/tests/table/bugs/bug43854-2.html b/mozilla/layout/html/tests/table/bugs/bug43854-2.html
new file mode 100644
index 00000000000..be7aa69a2a9
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug43854-2.html
@@ -0,0 +1,83 @@
+<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/mozilla/layout/html/tests/table/bugs/bug52505.html b/mozilla/layout/html/tests/table/bugs/bug52505.html
new file mode 100644
index 00000000000..4b612e14951
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug52505.html
@@ -0,0 +1,34 @@
+<!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/mozilla/layout/html/tests/table/bugs/bug52506.html b/mozilla/layout/html/tests/table/bugs/bug52506.html
new file mode 100644
index 00000000000..68328969a2e
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug52506.html
@@ -0,0 +1,34 @@
+<!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/mozilla/layout/html/tests/table/bugs/bug55527.html b/mozilla/layout/html/tests/table/bugs/bug55527.html
new file mode 100644
index 00000000000..e2ae9327d9f
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug55527.html
@@ -0,0 +1,70 @@
+<!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/mozilla/layout/html/tests/table/bugs/bug56405.html b/mozilla/layout/html/tests/table/bugs/bug56405.html
new file mode 100644
index 00000000000..8540e766a8c
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug56405.html
@@ -0,0 +1,20 @@
+<!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/mozilla/layout/html/tests/table/bugs/bug59354.html b/mozilla/layout/html/tests/table/bugs/bug59354.html
new file mode 100644
index 00000000000..7a308ad3918
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug59354.html
@@ -0,0 +1,50 @@
+<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/mozilla/layout/html/tests/table/bugs/bug60804.html b/mozilla/layout/html/tests/table/bugs/bug60804.html
new file mode 100644
index 00000000000..6c67b5cddeb
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug60804.html
@@ -0,0 +1,34 @@
+<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/mozilla/layout/html/tests/table/bugs/bug67915-1.html b/mozilla/layout/html/tests/table/bugs/bug67915-1.html
new file mode 100644
index 00000000000..29b765d15d6
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug67915-1.html
@@ -0,0 +1,221 @@
+<html>
+<body>
+
+<table align="center" cellpadding="10" border="1">
+
+<tr align="center" valign="center">
+<td>A</td>
+<td><img src="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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="http://www.mozilla.org/projects/mathml/screenshots/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/mozilla/layout/html/tests/table/bugs/bug67915-2.html b/mozilla/layout/html/tests/table/bugs/bug67915-2.html
new file mode 100644
index 00000000000..11b530396d9
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug67915-2.html
@@ -0,0 +1,6 @@
+<table width=120% border>
+ <tr>
+  <td>foo</td>
+ </tr>
+</table>
+
diff --git a/mozilla/layout/html/tests/table/bugs/bug69187.html b/mozilla/layout/html/tests/table/bugs/bug69187.html
new file mode 100644
index 00000000000..b381c99c005
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug69187.html
@@ -0,0 +1,44 @@
+<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/mozilla/layout/html/tests/table/bugs/bug69382-1.html b/mozilla/layout/html/tests/table/bugs/bug69382-1.html
new file mode 100644
index 00000000000..3a74868284f
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug69382-1.html
@@ -0,0 +1,117 @@
+<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/mozilla/layout/html/tests/table/bugs/bug69382-2.html b/mozilla/layout/html/tests/table/bugs/bug69382-2.html
new file mode 100644
index 00000000000..27c74bdff8d
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug69382-2.html
@@ -0,0 +1,31 @@
+<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/mozilla/layout/html/tests/table/bugs/file_list4.txt b/mozilla/layout/html/tests/table/bugs/file_list4.txt
index a281bd78a4a..0b9f58a6f56 100644
--- a/mozilla/layout/html/tests/table/bugs/file_list4.txt
+++ b/mozilla/layout/html/tests/table/bugs/file_list4.txt
@@ -18,6 +18,7 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug29058-1.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug29058-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug29058-3.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug29157.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug29314.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug29326.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug29429.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2947.html
diff --git a/mozilla/layout/html/tests/table/bugs/file_list5.txt b/mozilla/layout/html/tests/table/bugs/file_list5.txt
index eab924c0eb2..0351e124403 100644
--- a/mozilla/layout/html/tests/table/bugs/file_list5.txt
+++ b/mozilla/layout/html/tests/table/bugs/file_list5.txt
@@ -16,6 +16,7 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug3681-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug3718.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug38916.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug3977.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug39209.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug40828.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug4093.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug41890.html
@@ -27,6 +28,8 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug42443.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug43204.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug4382.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug4385.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug43854-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug43854-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug4427.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug4429.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug44523.html
@@ -56,15 +59,19 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug50695-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug51140.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug51727.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug5188.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug52505.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug52506.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug53690-1.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug53690-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug53891.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug5538.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug55527.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug55545.html
 # Non-existant test case?
 #file:///s|/mozilla/layout/html/tests/table/bugs/bug55563.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug55789.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug56024.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug56024.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug56201.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug57378.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug57828.html
@@ -76,3 +83,4 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug5799.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug5835.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug5838.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug59252.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug59354.html
diff --git a/mozilla/layout/html/tests/table/bugs/file_list6.txt b/mozilla/layout/html/tests/table/bugs/file_list6.txt
index 3bef53adf90..36aabd71e89 100644
--- a/mozilla/layout/html/tests/table/bugs/file_list6.txt
+++ b/mozilla/layout/html/tests/table/bugs/file_list6.txt
@@ -1,4 +1,5 @@
 file:///s|/mozilla/layout/html/tests/table/bugs/bug60749.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug60804.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug60807.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug61042-1.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug61042-2.html
@@ -14,8 +15,13 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug650.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug65372.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug6674.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug6674.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug67915-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug67915-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug67864.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug68912.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug69187.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug69382-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug69382-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug709.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug7112-1.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug7112-2.html
diff --git a/mozilla/layout/html/tests/table/interactive/bug44148.html b/mozilla/layout/html/tests/table/interactive/bug44148.html
new file mode 100644
index 00000000000..d27b956d6a9
--- /dev/null
+++ b/mozilla/layout/html/tests/table/interactive/bug44148.html
@@ -0,0 +1,71 @@
+<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/mozilla/layout/html/tests/table/interactive/bug66804.html b/mozilla/layout/html/tests/table/interactive/bug66804.html
new file mode 100644
index 00000000000..666919a6290
--- /dev/null
+++ b/mozilla/layout/html/tests/table/interactive/bug66804.html
@@ -0,0 +1,22 @@
+<!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/mozilla/layout/html/tests/table/printing/bug59280-1.html b/mozilla/layout/html/tests/table/printing/bug59280-1.html
new file mode 100644
index 00000000000..b16dc560fbb
--- /dev/null
+++ b/mozilla/layout/html/tests/table/printing/bug59280-1.html
@@ -0,0 +1,509 @@
+<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="http://www.amazon.com/g/marketing/amazon-logo.gif" width=142 height=31 border=0 alt="Amazon.com logo"></a></td>
+    <td height="61"> 
+      <div align="right">
+        <img src="http://www.amazon.com/g/gateway/0002/n/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="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 src="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 src="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 src="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">&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="http://www.amazon.com/g/cs-email/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/mozilla/layout/html/tests/table/printing/bug59280-2.html b/mozilla/layout/html/tests/table/printing/bug59280-2.html
new file mode 100644
index 00000000000..eab6411c639
--- /dev/null
+++ b/mozilla/layout/html/tests/table/printing/bug59280-2.html
@@ -0,0 +1,188 @@
+<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/mozilla/layout/html/tests/table/printing/bug61663.html b/mozilla/layout/html/tests/table/printing/bug61663.html
new file mode 100644
index 00000000000..6cf1d0eb606
--- /dev/null
+++ b/mozilla/layout/html/tests/table/printing/bug61663.html
@@ -0,0 +1,131 @@
+<!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>text</td></tr>
+</table>
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/table/printing/bug66804.html b/mozilla/layout/html/tests/table/printing/bug66804.html
new file mode 100644
index 00000000000..9181e4c9883
--- /dev/null
+++ b/mozilla/layout/html/tests/table/printing/bug66804.html
@@ -0,0 +1,50 @@
+<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/mozilla/layout/html/tests/table/printing/file_list.txt b/mozilla/layout/html/tests/table/printing/file_list.txt
index e3a23f83a7b..559d00a93ef 100644
--- a/mozilla/layout/html/tests/table/printing/file_list.txt
+++ b/mozilla/layout/html/tests/table/printing/file_list.txt
@@ -1,12 +1,16 @@
+file:///s|/mozilla/layout/html/tests/table/printing/bug26792.html
 file:///s|/mozilla/layout/html/tests/table/printing/bug53690.html
 file:///s|/mozilla/layout/html/tests/table/printing/bug54829.html
-file:///s|/mozilla/layout/html/tests/table/printing/bug56792.html
 file:///s|/mozilla/layout/html/tests/table/printing/bug57378.html
 file:///s|/mozilla/layout/html/tests/table/printing/bug57467.html
+file:///s|/mozilla/layout/html/tests/table/printing/bug59280-1.html
+file:///s|/mozilla/layout/html/tests/table/printing/bug59280-2.html
+file:///s|/mozilla/layout/html/tests/table/printing/bug61663.html
+file:///s|/mozilla/layout/html/tests/table/printing/bug66804.html
 file:///s|/mozilla/layout/html/tests/table/printing/split2Rows.html
 file:///s|/mozilla/layout/html/tests/table/printing/split3Rows.html
 file:///s|/mozilla/layout/html/tests/table/printing/splitCell-1.html
 file:///s|/mozilla/layout/html/tests/table/printing/splitCell-2.html
 file:///s|/mozilla/layout/html/tests/table/printing/tfoot.html
 file:///s|/mozilla/layout/html/tests/table/printing/thead.html
-file:///s|/mozilla/layout/html/tests/table/printing/theadfoot.html
+file:///s|/mozilla/layout/html/tests/table/printing/theadtfoot.html
diff --git a/mozilla/layout/html/tests/table/rtest.bat b/mozilla/layout/html/tests/table/rtest.bat
index 9fd69566cd7..75b841acdbd 100755
--- a/mozilla/layout/html/tests/table/rtest.bat
+++ b/mozilla/layout/html/tests/table/rtest.bat
@@ -18,5 +18,8 @@ call rtest.bat %1
 cd ..\dom
 call rtest.bat %1
 
+cd ..\printing
+call rtest.bat %1
+
 cd ..
 
diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp
index d1b2aefc1dc..1ce6c618eec 100644
--- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp
@@ -1302,6 +1302,15 @@ nsBoxFrame::Paint(nsIPresContext* aPresContext,
       nsCSSRendering::PaintOutline(aPresContext, aRenderingContext, this,
                                   aDirtyRect, rect, *border, *outline, mStyleContext, 0);
       
+      // See if we need to cache the background color
+      nsIFrame* parent = nsnull;
+      GetParent(&parent);
+      nsIAtom* parentType = nsnull;
+      parent->GetFrameType(&parentType);
+      if (nsLayoutAtoms::rootFrame == parentType) {
+        SetDefaultBackgroundColor(aPresContext);
+      }
+
       // The sole purpose of this is to trigger display
       //  of the selection window for Named Anchors,
       //  which don't have any children and normally don't
diff --git a/mozilla/lib/mac/Instrumentation/InstrumentationHelpers.h b/mozilla/lib/mac/Instrumentation/InstrumentationHelpers.h
new file mode 100644
index 00000000000..3c706b78ce3
--- /dev/null
+++ b/mozilla/lib/mac/Instrumentation/InstrumentationHelpers.h
@@ -0,0 +1,149 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY 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 Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *        Simon Fraser  sfraser@netscape.com
+ */
+
+
+/*
+
+	About this file
+	---------------
+	
+	This file contains some handy macros, and a stack-based class that makes
+	instrumenting functions with Apple's Instrumentation SDK easier.
+	
+	Instrumentation SDK
+	-------------------
+	
+	The Instrumentation SDK allows you to do code performance analysis,
+	collecting time-based data, and other data by putting instrumentation
+	points in your code, and running.
+	
+	You can get the instrumentation SDK from:
+	
+	ftp://ftp.apple.com/developer/Development_Kits/Instrumentation_SDK.hqx
+	
+	To find out how to use the Instrumentation Toolkit, read the documentation
+	that comes with the SDK. I'm not going to explain all that here.
+	
+	Setting up your tree
+	--------------------
+	
+	Put the headers and libraries from the Instrumentation SDK into
+	a folder in your CodeWarrior 'Mac OS Support' folder.
+	
+	How to use
+	----------
+	
+	In C++ code, the following macros can be used thusly:
+	
+	NS_IMETHODIMP nsBigThing::SlowFunction()
+	{
+	  INST_TRACE("SomeLocationDescription");			// Descriptive label. Don't use :: here.
+	
+	  // code that might return anywhere.
+	  ...
+	
+	  return NS_OK;
+	}
+	
+  Because the INST_TRACE macro makes a stack-based StInstrumentationLog,
+  exit from the function will be traced wherever it occurs.
+  
+  You will also need to add the "InstrumentationLib" stub library to the
+  project.
+  
+  Such instrumentation points will give you data for the
+  'Trace Time Line Viewer' in the viewer. There are many other types
+  of instrumentation data you can collect; see the docs in the SDK
+  for more information.
+  
+  Stalking the wild time sink
+  ---------------------------
+  
+  Your general strategy when using the Instrumentation tools to
+  track down performance problems should be to start at the high
+  level, then drill down into subroutines. You want to avoid 
+  instrumenting routines that are called hundreds of thousands
+  of times, because you'll end up with massive data files. Rather,
+  instrument their calling routines to get a good sense of where
+  the time goes.
+  
+  This kind of performance analysis does not replace the more
+  traditional profiling tools. Rather, it allows you to analyse
+  performance problems in terms of behaviour and timing, rather
+  than a simply overview of % of time spent in different routines.
+
+*/
+
+#include <InstrumentationMacros.h>
+
+#ifdef __cplusplus
+/* Stack-based class to do logging */
+
+class StInstrumentationLog
+{
+public:
+		StInstrumentationLog(const char* traceName, InstTraceClassRef &ioTraceClassRef)
+		{
+			if (ioTraceClassRef == 0)
+			{
+				if (InstCreateTraceClass( kInstRootClassRef, traceName, 0, kInstEnableClassMask, &ioTraceClassRef) != noErr)
+				{
+					DebugStr("\pFailed to make instrumentation trace class");
+					return;
+				}
+			}
+			
+			mTraceClassRef = ioTraceClassRef;
+			mEventTag = InstCreateEventTag();
+			InstLogTraceEvent(mTraceClassRef, mEventTag, kInstStartEvent);
+		}
+		
+		~StInstrumentationLog()
+		{
+			InstLogTraceEvent(mTraceClassRef, mEventTag, kInstEndEvent);
+		}
+		
+		void LogMiddleEvent()
+		{
+			InstLogTraceEvent(mTraceClassRef, mEventTag, kInstMiddleEvent);
+		}
+		
+		void LogMiddleEventWithData(const char* inFormatString, void* inEventData)
+		{
+			InstDataDescriptorRef	dataDesc;
+			InstCreateDataDescriptor(inFormatString, &dataDesc);
+			InstLogTraceEventWithData(mTraceClassRef, mEventTag, kInstMiddleEvent, dataDesc, inEventData);
+			InstDisposeDataDescriptor(dataDesc);
+		}
+		
+protected:
+
+	InstTraceClassRef	mTraceClassRef;
+	InstEventTag		mEventTag;
+};
+
+#define INST_TRACE(n)					static InstTraceClassRef __sTrace = 0;  StInstrumentationLog  traceLog((n), __sTrace)
+#define INST_TRACE_MIDDLE			do { traceLog.LogMiddleEvent(); } while(0)
+#define INST_TRACE_DATA(s, d)	do { traceLog.LogMiddleEventWithData((s), (d)); } while (0)
+
+#endif /* __cplusplus */
diff --git a/mozilla/lib/mac/Instrumentation/MANIFEST b/mozilla/lib/mac/Instrumentation/MANIFEST
new file mode 100644
index 00000000000..e8e852cd6f4
--- /dev/null
+++ b/mozilla/lib/mac/Instrumentation/MANIFEST
@@ -0,0 +1 @@
+InstrumentationHelpers.h
diff --git a/mozilla/mailnews/base/resources/content/dbviewtest.xul b/mozilla/mailnews/base/resources/content/dbviewtest.xul
deleted file mode 100644
index 333ae92a135..00000000000
--- a/mozilla/mailnews/base/resources/content/dbviewtest.xul
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?> 
-
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
-
-<window xmlns:NC="http://home.netscape.com/NC-rdf#" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- 
-<script language="JavaScript" src="chrome://messenger/content/dbviewtest.js"/>
-
-<box orient="vertical">
-  <button class="dialog" label="create view" onclick="createView()"/>
-  <button class="dialog" label="populate view" onclick="populateView()"/>
-  <button class="dialog" label="dump view" onclick="dumpView()"/>
-
-  <button class="dialog" label="sort date ascending" onclick="sortDateAscending()"/>
-  <button class="dialog" label="sort date decending" onclick="sortDateDescending()"/>
-  <button class="dialog" label="sort thread ascending" onclick="sortThreadedAscending()"/>
-  <button class="dialog" label="sort thread descending" onclick="sortThreadedDescending()"/>
-</box>
-
-</window>
diff --git a/mozilla/mailnews/compose/prefs/resources/content/pref-messages.xul b/mozilla/mailnews/compose/prefs/resources/content/pref-messages.xul
deleted file mode 100644
index e3ef25ce49a..00000000000
--- a/mozilla/mailnews/compose/prefs/resources/content/pref-messages.xul
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://messengercompose/locale/pref-messages.dtd">
-
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    onload="parent.initPanel('chrome://messengercompose/content/pref-messages.xul');"
-    orient="vertical"
-    class="color-dialog">
-    
-  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
-
-  <titledbox orient="vertical">
-    <label value="&forwardReply.label;"/>
-    
-    <box autostretch="never">
-      <text class="label" value="&forwardMsg.label;" accesskey="&forwardMsg.accesskey;"/>
-      <menulist id="forwardMessageMode" 
-                pref="true" preftype="int" prefstring="mail.forward_message_mode"
-                prefattribute="value">
-        <menupopup>
-          <menuitem value="0" label="&asAttachment.label;" accesskey="&asAttachment.accesskey;"/>
-          <menuitem value="1" label="&quoted.label;" accesskey="&quoted.accesskey;"/>
-          <menuitem value="2" label="&inline.label;" accesskey="&inline.accesskey;"/>
-        </menupopup>
-      </menulist>
-    </box>
-    
-    <checkbox id="autoQuote" label="&autoQuote.label;" 
-              pref="true" preftype="bool" prefstring="mail.auto_quote"
-              prefattribute="checked"/>   
-    <box autostretch="never">
-      <text class="label" value="&then.label;" accesskey="&then.accesskey;" for="replyOnTop"/>
-      <menulist id="replyOnTop" pref="true" preftype="int" prefstring="mailnews.reply_on_top"
-                prefattribute="value">
-        <menupopup>
-          <menuitem value="1" label="&aboveQuote.label;" accesskey="&aboveQuote.accesskey;"/>
-          <menuitem value="0" label="&belowQuote.label;" accesskey="&belowQuote.accesskey;"/>
-          <menuitem value="2" label="&selectAndAboveQuote.label;" accesskey="&selectAndAboveQuote.accesskey;"/>
-          <menuitem value="3" label="&selectAndBelowQuote.label;" accesskey="&selectAndBelowQuote.accesskey;"/>
-        </menupopup>
-      </menulist>        
-    </box>
-  </titledbox>
-
-  <!-- Reading -->
-  <titledbox orient="vertical" autostretch="never">
-    <label value="&readingMessagesHeader.label;"/>
-
-    <checkbox id="wrapLongLines" label="&wrapInMsg.label;"
-              pref="true" preftype="bool" prefstring="mail.wrap_long_lines" 
-              prefattribute="checked"/>
-    <checkbox id="displayGlyph" label="&convertEmoticons.label;"
-              pref="true" preftype="bool" prefstring="mail.display_glyph"
-              prefattribute="checked"/>   
-    <checkbox id="displayStruct" label="&convertStructs.label;" 
-              pref="true" preftype="bool" prefstring="mail.display_struct"
-              prefattribute="checked"/>
-  </titledbox>
-
-  <!-- Sending -->
-  <titledbox orient="vertical">
-    <label value="&sendingMessagesHeader.label;"/>
-        
-    <checkbox id="spellCheckBeforeSend" label="&spellCheck.label;"
-              pref="true" preftype="bool" prefstring="mail.SpellCheckBeforeSend"
-              prefattribute="checked"/>
-    <checkbox id="sendStruct" label="&convertStructs.label;"
-              pref="true" preftype="bool" prefstring="mail.send_struct"
-              prefattribute="checked"/>
-    <box autostretch="never">
-      <text class="label" value="&wrapOutMsg.label;" accesskey="&wrapOutMsg.accesskey;" for="wrapLength"/>
-      <textbox id="wrapLength" size="3" pref="true" preftype="int"
-                 prefstring="mailnews.wraplength" prefattribute="value"/>
-      <text class="label" value="&char.label;"/>
-    </box>  
-
-    <html>&use8Bits.label;</html>
-    <radiogroup id="strictlyMime" orient="vertical" autostretch="never"
-                pref="true" preftype="bool" prefstring="mail.strictly_mime"
-                prefattribute="value">
-      <radio group="strictlyMime" value="false" label="&asIs.label;"/>
-      <radio group="strictlyMime" value="true" label="&useMIME.label;"/>
-    </radiogroup>                
-  </titledbox>
-
-</window>
diff --git a/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp b/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
index 5930a0863d1..2d86fb1a121 100644
--- a/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
+++ b/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
@@ -340,7 +340,7 @@ NS_IMETHODIMP nsJPEGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PR
                                            JPOOL_IMAGE,
                                            row_stride, 1);
 
-#if defined(XP_PC) || defined(XP_MAC)
+#if defined(XP_PC) || defined(XP_BEOS) || defined(XP_MAC)
     // allocate buffer to do byte flipping if needed
     if (mInfo.output_components == 3) {
       mRGBPadRow = (PRUint8*) PR_MALLOC(row_stride);
diff --git a/mozilla/security/Makefile.in b/mozilla/security/Makefile.in
new file mode 100644
index 00000000000..3ea4219afa8
--- /dev/null
+++ b/mozilla/security/Makefile.in
@@ -0,0 +1,31 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY 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 Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= manager
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/themes/classic/global/mac/classicBindings.xml b/mozilla/themes/classic/global/mac/classicBindings.xml
index 62a54687b16..ffc374ea9b7 100644
--- a/mozilla/themes/classic/global/mac/classicBindings.xml
+++ b/mozilla/themes/classic/global/mac/classicBindings.xml
@@ -98,6 +98,14 @@
     </content>
   </binding>
   
+  <binding id="scrollbarbutton">
+    <content>
+      <xul:box class="scrollbarbutton-box" flex="1">
+        <xul:image class="scrollbarbutton-icon" inherits="src"/>
+      </xul:box>
+    </content>
+  </binding>
+  
   <binding id="slider">
     <content>
       <xul:button class="slider-button"/>
diff --git a/mozilla/themes/classic/global/win/classicBindings.xml b/mozilla/themes/classic/global/win/classicBindings.xml
index 86b7fa2008c..64e3d7cd383 100644
--- a/mozilla/themes/classic/global/win/classicBindings.xml
+++ b/mozilla/themes/classic/global/win/classicBindings.xml
@@ -66,7 +66,7 @@
     </content>
   </binding>
 
-  <binding id="thumb" extends="chrome://global/content/scrollbarBindings.xml#thumb">
+  <binding id="thumb" extends="xul:button">
     <content>
       <xul:box class="thumb-box" autostretch="never" orient="vertical" flex="1">
         <xul:spring class="thumb-spring" flex="1"/>
@@ -84,7 +84,12 @@
     </content>
   </binding>
   
-  <binding id="scrollbarbutton" extends="chrome://global/content/scrollbarBindings.xml#scrollbarbutton">
+  <binding id="scrollbarbutton">
+    <content>
+      <xul:box class="scrollbarbutton-box" flex="1">
+        <xul:image class="scrollbarbutton-icon" inherits="src"/>
+      </xul:box>
+    </content>
   </binding>
 
   <binding id="slider">
diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
index b7af5e0925b..f1ea119e236 100644
--- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
@@ -410,8 +410,9 @@ NS_IMETHODIMP nsBrowserWindow::SetFocus()
    return NS_OK;
 }
 
-NS_IMETHODIMP nsBrowserWindow::FocusAvailable(nsIBaseWindow* aCurrentFocus, 
-   PRBool* aTookFocus)
+NS_IMETHODIMP nsBrowserWindow::FocusAvailable(nsIBaseWindow* aCurrentFocus,
+                                              PRBool aForward,
+                                              PRBool* aTookFocus)
 {
    //XXX First Check In
    NS_ASSERTION(PR_FALSE, "Not Yet Implemented");
diff --git a/mozilla/widget/public/nsIBaseWindow.idl b/mozilla/widget/public/nsIBaseWindow.idl
index 3de28ffde85..0fc77e7cf44 100644
--- a/mozilla/widget/public/nsIBaseWindow.idl
+++ b/mozilla/widget/public/nsIBaseWindow.idl
@@ -197,7 +197,9 @@ interface nsIBaseWindow : nsISupports
 	it's parent.  Note an object should not take focus for itself by giving it
 	to a child.  In most cases this function is being called because the child
 	is trying to give up focus. */
-	void focusAvailable(in nsIBaseWindow aCurrentFocus, out boolean aTookFocus);
+	void focusAvailable(in nsIBaseWindow aCurrentFocus,
+                      in boolean aForward,
+                      out boolean aTookFocus);
 
 	/*
 	Title of the window.
diff --git a/mozilla/widget/src/gtkxtbin/gtkxtbin.c b/mozilla/widget/src/gtkxtbin/gtkxtbin.c
index 92b8c058cd5..6c84396ee89 100644
--- a/mozilla/widget/src/gtkxtbin/gtkxtbin.c
+++ b/mozilla/widget/src/gtkxtbin/gtkxtbin.c
@@ -420,6 +420,10 @@ gtk_xtbin_shutdown (GtkObject *object)
                         GDK_WINDOW_XWINDOW(GTK_WIDGET(object)->window)));
 #endif
 
+    /* flush the queue before we returning origin top_widget->core.window
+       or we can get X error since the window is gone */
+    XSync(xtbin->xtdisplay, False);
+
     xtbin->xtwidget->core.window = GPOINTER_TO_UINT(gtk_object_get_data(object, "oldwindow"));
     XtUnrealizeWidget(xtbin->xtwidget);
 
diff --git a/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp
index 4f67491324a..4a4e2ca2ec9 100644
--- a/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp
+++ b/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp
@@ -310,10 +310,11 @@ NS_IMETHODIMP nsChromeTreeOwner::SetFocus()
    return mXULWindow->SetFocus();
 }
 
-NS_IMETHODIMP nsChromeTreeOwner::FocusAvailable(nsIBaseWindow* aCurrentFocus, 
-   PRBool* aTookFocus)
+NS_IMETHODIMP nsChromeTreeOwner::FocusAvailable(nsIBaseWindow* aCurrentFocus,
+                                                PRBool aForward,
+                                                PRBool* aTookFocus)
 {
-   return mXULWindow->FocusAvailable(aCurrentFocus, aTookFocus);
+   return mXULWindow->FocusAvailable(aCurrentFocus, aForward, aTookFocus);
 }
 
 NS_IMETHODIMP nsChromeTreeOwner::GetTitle(PRUnichar** aTitle)
diff --git a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp
index 266218abf80..cf8b3f7a696 100644
--- a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp
+++ b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp
@@ -511,10 +511,11 @@ NS_IMETHODIMP nsContentTreeOwner::SetFocus()
    return mXULWindow->SetFocus();
 }
 
-NS_IMETHODIMP nsContentTreeOwner::FocusAvailable(nsIBaseWindow* aCurrentFocus, 
-   PRBool* aTookFocus)
+NS_IMETHODIMP nsContentTreeOwner::FocusAvailable(nsIBaseWindow* aCurrentFocus,
+                                                 PRBool aForward,
+                                                 PRBool* aTookFocus)
 {
-   return mXULWindow->FocusAvailable(aCurrentFocus, aTookFocus);
+   return mXULWindow->FocusAvailable(aCurrentFocus, aForward, aTookFocus);
 }
 
 NS_IMETHODIMP nsContentTreeOwner::GetTitle(PRUnichar** aTitle)
diff --git a/mozilla/xpfe/appshell/src/nsXULWindow.cpp b/mozilla/xpfe/appshell/src/nsXULWindow.cpp
index 984b97cdb9b..f2151baa0e2 100644
--- a/mozilla/xpfe/appshell/src/nsXULWindow.cpp
+++ b/mozilla/xpfe/appshell/src/nsXULWindow.cpp
@@ -588,8 +588,9 @@ NS_IMETHODIMP nsXULWindow::SetFocus()
    return NS_OK;
 }
 
-NS_IMETHODIMP nsXULWindow::FocusAvailable(nsIBaseWindow* aCurrentFocus, 
-   PRBool* aTookFocus)
+NS_IMETHODIMP nsXULWindow::FocusAvailable(nsIBaseWindow* aCurrentFocus,
+                                          PRBool aForward,
+                                          PRBool* aTookFocus)
 {
    return NS_OK;
 }
diff --git a/mozilla/xpfe/browser/resources/content/openLocation.xul b/mozilla/xpfe/browser/resources/content/openLocation.xul
deleted file mode 100644
index e685be9aaf4..00000000000
--- a/mozilla/xpfe/browser/resources/content/openLocation.xul
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?> 
-
-<!-- 
-  The contents of this file are subject to the Netscape Public
-  License Version 1.1 (the "License"); you may not use this file
-  except in compliance with the License. You may obtain a copy of
-  the License at http://www.mozilla.org/NPL/
-  
-  Software distributed under the License is distributed on an "AS
-  IS" basis, WITHOUT WARRANTY OF ANY 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 client code, released
-  March 31, 1998.
-  
-  The Initial Developer of the Original Code is Netscape
-  Communications Corporation. Portions created by Netscape are
-  Copyright (C) 1998-1999 Netscape Communications Corporation. All
-  Rights Reserved.
-  
-  Contributor(s): 
-    Ben Goodger <ben@netscape.com>
-    Michael Lowe <michael.lowe@bigfoot.com> 
-
--->
-
-<?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
-
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<!DOCTYPE window [
-  <!ENTITY % mozRegionalDTD SYSTEM "chrome://global-region/locale/region.dtd" >
-  %mozRegionalDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-  %brandDTD;
-  <!ENTITY % openDialogDTD SYSTEM "chrome://navigator/locale/openLocation.dtd" >
-  %openDialogDTD;
-]>            
- 
-<window id="openLocation"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&caption.label;"
-        onload="onLoad()"
-        style="width: 40em;"
-        class="dialog"
-        align="vertical"
-        persist="screenX screenY"
-        screenX="24" screenY="24">
-              
-  <script language="javascript" src="chrome://global/content/strres.js"/>
-  <script language="javascript" src="chrome://global/content/globalOverlay.js"/>  
-  <script language="javascript" src="chrome://navigator/content/openLocation.js"/>
-  <script language="javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-                   
-  <keyset id="keyset"/>
-           
-  <box>
-    <box orient="vertical">
-      <image class="question-icon"/>
-      <spring flex="1"/>
-    </box>
-    <separator orient="vertical" class="thin"/>
-    <box orient="vertical" flex="1">
-      <html>&enter.label;</html>
-      <separator class="thin"/>
-
-      <box autostretch="never">
-        <textfield id="dialog.input" flex="1" oninput="doEnabling();"/>
-        <button value="&chooseFile.label;" onclick="onChooseFile();"/>
-      </box>
-      <box autostretch="never" valign="center">
-        <text class="label" value="&openWhere.label;"/>
-        <menulist id="openAppList">
-          <menupopup>
-            <menuitem data="0" id="currentWindow" value="&topWindow.label;"/>
-            <menuitem data="1" value="&newWindow.label;"/>
-            <menuseparator/>
-            <menuitem data="2" id="editWindow" value="&editNewWindow.label;"/>
-          </menupopup>
-        </menulist>
-        <spring flex="1"/>
-      </box>
-    </box>
-  </box> 
-
-  <separator/>
-
-  <box id="okCancelButtonsRight"/>
-           
- </window>
diff --git a/mozilla/xpfe/communicator/resources/content/nsContextMenu.js b/mozilla/xpfe/communicator/resources/content/nsContextMenu.js
index 1739623ba9d..595adc0b074 100644
--- a/mozilla/xpfe/communicator/resources/content/nsContextMenu.js
+++ b/mozilla/xpfe/communicator/resources/content/nsContextMenu.js
@@ -255,7 +255,7 @@ nsContextMenu.prototype = {
                if(this.target.getAttribute( "type" ).toUpperCase() == "IMAGE") {
                  this.onImage = true;
                  // Convert src attribute to absolute URL.
-                 this.imageURL = this.makeURLAbsolute( this.target.baseURI,
+                 this.imageURL = this.makeURLAbsolute( this.target.ownerDocument,
                                                        this.target.src );
                } else /* if (this.target.getAttribute( "type" ).toUpperCase() == "TEXT") */ {
                  this.onTextInput = this.isTargetATextBox(this.target);
@@ -265,7 +265,7 @@ nsContextMenu.prototype = {
             } else if ( this.target.getAttribute( "background" ) ) {
                this.onImage = true;
                // Convert background attribute to absolute URL.
-               this.imageURL = this.makeURLAbsolute( this.target.baseURI,
+               this.imageURL = this.makeURLAbsolute( this.target.ownerDocument,
                                                      this.target.getAttribute( "background" ) );
             } else if ( "HTTPIndex" in _content &&
                         _content.HTTPIndex instanceof Components.interfaces.nsIHTTPIndex ) {
@@ -309,7 +309,7 @@ nsContextMenu.prototype = {
                         this.onImage = true;
                         var url = cssAttr.toLowerCase().replace(/url\("*(.+)"*\)/, "$1");
                         // Convert attribute to absolute URL.
-                        this.imageURL = this.makeURLAbsolute( this.target.baseURI, url );
+                        this.imageURL = this.makeURLAbsolute( this.target.ownerDocument, url );
                     }
                 } catch ( exception ) {
                 }
@@ -524,11 +524,11 @@ nsContextMenu.prototype = {
         if (this.link.href) {
           return this.link.href;
         }
+        // XXX TODO Relative URLs, XML Base
         var href = this.link.getAttributeNS("http://www.w3.org/1999/xlink","href");
         if (href == "") {
           throw "Empty href"; // Without this we try to save as the current doc, for example, HTML case also throws if empty
         }
-        href = this.makeURLAbsolute(this.link.baseURI,href);
         return href;
     },
     // Get text of link (if possible).
@@ -602,15 +602,22 @@ nsContextMenu.prototype = {
         // Extract url from data= attribute.
         var data = objElem.getAttribute( "data" );
         // Make it absolute.
-        return this.makeURLAbsolute( objElem.baseURI, data );
+        return this.makeURLAbsolute( objElem.ownerDocument, data );
     },
     // Convert relative URL to absolute, using document's <base>.
-    makeURLAbsolute : function ( base, url ) {
+    makeURLAbsolute : function ( doc, url ) {
         // Construct nsIURL.
         var baseURL = this.createInstance( "@mozilla.org/network/standard-url;1", "nsIURL" );
-        // Initialize from base url.
-        baseURL.spec = base;
-        // Resolve
+        // Initialize from document url.
+        baseURL.spec = doc.location.href;
+        // Look for <base> tag.
+        var baseTags = doc.getElementsByTagName( "BASE" );
+        if ( baseTags && baseTags.length ) {
+            // Reset base URL using href attribute of <base> tag.
+            var href = baseTags[ baseTags.length - 1 ].getAttribute( "href" );
+            baseURL.spec = baseURL.resolve( href );
+        }
+        // Finally, convert argument url using base.
         var result = baseURL.resolve( url );
         return result;
     },
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
deleted file mode 100644
index f71ddc1a626..00000000000
--- a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
-<!--
-
-  The contents of this file are subject to the Netscape Public
-  License Version 1.1 (the "License"); you may not use this file
-  except in compliance with the License. You may obtain a copy of
-  the License at http://www.mozilla.org/NPL/
- 
-  Software distributed under the License is distributed on an "AS
-  IS" basis, WITHOUT WARRANTY OF ANY 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 Netscape are
-  Copyright (C) 1998 Netscape Communications Corporation. All
-  Rights Reserved.
- 
-  Contributor(s): 
-    Ben Goodger <ben@netscape.com> (Original Author, v2.0)
-
--->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksWindow.css" type="text/css"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/bookmarks/bookmarksOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
-
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
-
-<window id="bookmarksPanel" orient="vertical"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="Startup();">
-
-  <!-- Generic Utilities -->
-  <script type="application/x-javascript" src="chrome://global/content/nsTreeUtils.js"/>
-  <!-- XXX - would like to cut this dependency out -->
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
-
-  <!-- Bookmarks Shell -->
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksTree.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksPanel.js"/>
-
-  <!-- Drag and Drop -->
-  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
-
-
-  <!-- context menu, tooltips, etc -->
-  <popupset id="popupset"/>
-  
-  <!-- bookmarks string bundle -->
-  <stringbundleset id="stringbundleset"/>
-  
-  <!-- bookmarks & edit commands -->
-  <commands id="commands">
-    <commandset id="CommandUpdate_Bookmarks"
-                commandupdater="true"
-                events="focus,tree-select"
-                oncommandupdate="BookmarksTree.prototype.controller.onCommandUpdate()">
-    </commandset>                
-    <commandset id="bookmarksItems"/>
-  </commands>
-  
-  <box id="panel-bar" class="toolbar">
-    <button class="button-toolbar" label="&command.addBookmark.label;"
-            oncommand="gBookmarksShell.addBookmark();"/>
-    <button class="button-toolbar" label="&command.manageBookmarks.label;"
-            oncommand="gBookmarksShell.manageBookmarks();"/>
-  </box>
-  
-  <tree id="bookmarksTree" context="bmContext" ref="NC:BookmarksRoot"
-        datasources="rdf:bookmarks rdf:files rdf:httpindex rdf:localsearch rdf:internetsearch"
-        flags="dont-test-empty"
-        ondragover="nsDragAndDrop.dragOver(event, bookmarksDNDObserver);"
-        ondraggesture="nsDragAndDrop.startDrag(event, bookmarksDNDObserver);"
-        ondragdrop="nsDragAndDrop.drop(event, bookmarksDNDObserver);"
-        onclick="gBookmarksShell.treeClicked(event);"
-        style="height:0px" flex="1">
-
-    <template>
-      <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
-        <treechildren>
-          <treeitem uri="rdf:*"
-                    rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
-            <treerow>
-              <treecell autostretch="never"><treeindentation/>
-                        <separator class="groove" flex="1"/></treecell>
-            </treerow>
-          </treeitem>     
-        </treechildren>
-      </rule>
-  
-      <rule>
-        <treechildren>
-          <treeitem uri="rdf:*" persist="open" class="bookmark-item"
-                    web:status="rdf:http://home.netscape.com/WEB-rdf#status"
-                    type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
-                    loading="rdf:http://home.netscape.com/NC-rdf#loading">
-            <treerow>
-              <treecell class="treecell-indent treecell-editable"
-                        editable="true" label="rdf:http://home.netscape.com/NC-rdf#Name"
-                        src="rdf:http://home.netscape.com/NC-rdf#Icon"
-                        web:status="rdf:http://home.netscape.com/WEB-rdf#status"
-                        type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
-                        loading="rdf:http://home.netscape.com/NC-rdf#loading" />
-            </treerow>
-          </treeitem>
-        </treechildren>
-      </rule>
-    </template>
-
-    <treecolgroup id="theColumns">
-      <treecol id="Name"
-               sortSeparators="true" width="4*" flex="4"
-               persist="hidden width sortActive sortDirection" 
-               resource="http://home.netscape.com/NC-rdf#Name"/>
-    </treecolgroup>
-    
-    <treehead>
-      <treerow id="headRow">
-        <treecell class="treecell-header sortDirectionIndicator treecell-header-sidebarpanel"
-                  label="&tree.header.name.label;"
-                  onclick="return TriStateColumnSort('Name');"
-                  observes="Name" />
-      </treerow>
-    </treehead>
-
-    <treechildren flex="1" id="treechildren-bookmarks" 
-                  onclick="gBookmarksShell.treeOpen(event);"/>
-  </tree>
-
-</window>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
deleted file mode 100644
index 3b6705d0aac..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?> 
-
-<!--
-   The contents of this file are subject to the Netscape Public
-   License Version 1.1 (the "License"); you may not use this file
-   except in compliance with the License. You may obtain a copy of
-   the License at http://www.mozilla.org/NPL/
-    
-   implied. See the License for the specific language governing
-   rights and limitations under the License.
-    
-   The Original Code is Mozilla Communicator client code, released
-   March 31, 1998.
-   
-   The Initial Developer of the Original Code is Netscape
-   Communications Corporation. Portions created by Netscape are
-   Copyright (C) 1998-1999 Netscape Communications Corporation. All
-   Rights Reserved.
-   
-   Contributor(s):
-     Håkan Waara <hwaara@chello.se>
-     Peter Annema <disttsc@bart.nl>
-  -->
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % prefCookieDTD SYSTEM "chrome://communicator/locale/pref/pref-cookies.dtd" >
-%prefCookieDTD;
-]>
-
-<window xmlns:html="http://www.w3.org/1999/xhtml" id="cookieWindow"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="init();">
-          
-  <script type="application/x-javascript">
-  <![CDATA[
-  
-  var _elementIDs = ["networkCookieBehaviour", "networkWarnAboutCookies"];
-
-  function init()
-  {
-    parent.initPanel('chrome://communicator/content/pref/pref-cookies.xul'); 
-
-    var enabled = document.getElementById("networkCookieBehaviour").value != "2";
-    setWarnAboutCookiesEnabled(enabled);
-  }
-      
-  function viewCookies() 
-  {
-    window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","","modal=yes,chrome,resizable=yes", 0);
-  }  
-
-  function viewTutorial() 
-  {
-    window.openDialog
-      ("chrome://communicator/content/wallet/privacy.xul","","modal=yes,chrome,resizable=yes,height=400,width=600", 0);
-  }  
- 
-  function setWarnAboutCookiesEnabled(aEnabled)
-  {
-    document.getElementById("networkWarnAboutCookies").disabled = !aEnabled;
-  }
-
-  ]]>
-  </script>   
-
-  <box class="box-smallheader" id="cookieHeader" title="&lHeader;"/>
-
-  <titledbox orient="vertical">
-    <label value="&cookiePolicy.label;"/>
-
-    <html>&cookieDetails;</html>
-
-    <radiogroup id="networkCookieBehaviour" orient="vertical" autostretch="never"
-                pref="true" preftype="int" prefstring="network.cookie.cookieBehavior"
-                prefattribute="value">
-
-      <radio group="networkCookieBehaviour" value="2" label="&disableCookies.label;" 
-             accesskey="&disableCookies.accesskey;" oncommand="setWarnAboutCookiesEnabled(false);"/>
-      <radio group="networkCookieBehaviour" value="0" label="&accAllCookiesRadio.label;" 
-             accesskey="&accAllCookiesRadio.accesskey;" oncommand="setWarnAboutCookiesEnabled(true);"/>
-      <radio group="networkCookieBehaviour" value="1" label="&accOrgCookiesRadio.label;" 
-             accesskey="&accOrgCookiesRadio.accesskey;" oncommand="setWarnAboutCookiesEnabled(true);"/>
-
-    </radiogroup>
-
-    <separator/>
-    <box autostretch="never">
-      <checkbox id="networkWarnAboutCookies" label="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
-                pref="true" preftype="bool" prefstring="network.cookie.warnAboutCookies"
-                prefattribute="checked"/>
-    </box>
-
-    <separator/>
-
-    <box autostretch="never" halign="right">
-      <button class="dialog" label="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"/>
-      <button class="dialog" label="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"/>
-    </box>              
-  </titledbox>
-
-</window>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-images.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-images.xul
deleted file mode 100644
index fe7cc35cbe0..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-images.xul
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0"?> 
-
-<!--
-   The contents of this file are subject to the Netscape Public
-   License Version 1.1 (the "License"); you may not use this file
-   except in compliance with the License. You may obtain a copy of
-   the License at http://www.mozilla.org/NPL/
-    
-   implied. See the License for the specific language governing
-   rights and limitations under the License.
-    
-   The Original Code is Mozilla Communicator client code, released
-   March 31, 1998.
-   
-   The Initial Developer of the Original Code is Netscape
-   Communications Corporation. Portions created by Netscape are
-   Copyright (C) 1998-1999 Netscape Communications Corporation. All
-   Rights Reserved.
-   
-   Contributor(s): 
-     Håkan Waara <hwaara@chello.se>
-     Peter Annema <disttsc@bart.nl>
-  -->
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % prefImagesDTD SYSTEM "chrome://communicator/locale/pref/pref-images.dtd" >
-%prefImagesDTD;
-]>
-
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml" id="imagesWindow"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="init();">
-          
-  <script type="application/x-javascript">
-  <![CDATA[
-  
-  var _elementIDs = ["accOrgImages", "networkImageBehaviour", "networkImageWarnAboutImages"];
-
-  function init()
-  {
-    parent.initPanel('chrome://communicator/content/pref/pref-images.xul');
-
-    imageBlockingEnabled();
-
-    var enabled = document.getElementById("networkImageBehaviour").value != "2";
-    setWarnAboutImagesEnabled(enabled);
-  }
-
-  // Present finer control over image loading to the user.
-  // enable image blocker if "imageblocker.enabled" pref is true
-  function imageBlockingEnabled()
-  {
-    if (parent.hPrefWindow.getPref("bool", "imageblocker.enabled"))
-      document.getElementById("haveImageBlocking").removeAttribute("hidden");
-  }
-
-  function viewImages() 
-  {
-    window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","",
-                      "modal=yes,chrome,resizable=yes", 2);
-  }
-
-  function setWarnAboutImagesEnabled(aEnabled)
-  {
-    document.getElementById("networkImageWarnAboutImages").disabled = !aEnabled;
-  }
- 
-  ]]>
-  </script>
-
-  <broadcaster id="haveImageBlocking" hidden="true"/>
-
-  <box class="box-smallheader" id="imagesHeader" title="&lHeader;"/>
-
-  <titledbox orient="vertical" id="imagesArea">
-    <label value="&imageBlocking.label;"/>
-
-    <html>&imageDetails;</html>
-
-    <radiogroup id="networkImageBehaviour" orient="vertical" autostretch="never"
-                pref="true" preftype="int" prefstring="network.image.imageBehavior"
-                prefattribute="value">
-      <radio group="networkImageBehaviour" value="2" label="&disableImages.label;"
-             accesskey="&disableImages.accesskey;"
-             oncommand="setWarnAboutImagesEnabled(false);"/>
-      <radio group="networkImageBehaviour" value="0" label="&accAllImagesRadio.label;"
-             accesskey="&accAllImagesRadio.accesskey;"
-             oncommand="setWarnAboutImagesEnabled(true);"/>
-      <radio group="networkImageBehaviour" value="1" label="&accOrgImagesRadio.label;"
-             accesskey="&accOrgImagesRadio.accesskey;"
-             id="accOrgImages" observes="haveImageBlocking"
-             oncommand="setWarnAboutImagesEnabled(true);"/>
-    </radiogroup>
-
-    <separator observes="haveImageBlocking"/>
-    <box autostretch="never">
-      <checkbox id="networkImageWarnAboutImages" label="&warnAboutImages.label;"
-                accesskey="&warnAboutImages.accesskey;" observes="haveImageBlocking"
-                pref="true" preftype="bool" prefattribute="checked"
-                prefstring="network.image.warnAboutImages"/>
-    </box>
-
-    <separator observes="haveImageBlocking"/>
-
-    <box autostretch="never" halign="right">
-      <button class="dialog" id="viewImages" label="&viewImages.label;"
-              accesskey="&viewImages.accesskey;" oncommand="viewImages();"
-              observes="haveImageBlocking"/>
-    </box>
-
-  </titledbox>
-
-</window>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-passwords.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-passwords.xul
deleted file mode 100644
index 4c27485595b..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-passwords.xul
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?> 
-
-<!--
-   The contents of this file are subject to the Netscape Public
-   License Version 1.1 (the "License"); you may not use this file
-   except in compliance with the License. You may obtain a copy of
-   the License at http://www.mozilla.org/NPL/
-    
-   implied. See the License for the specific language governing
-   rights and limitations under the License.
-    
-   The Original Code is Mozilla Communicator client code, released
-   March 31, 1998.
-   
-   The Initial Developer of the Original Code is Netscape
-   Communications Corporation. Portions created by Netscape are
-   Copyright (C) 1998-1999 Netscape Communications Corporation. All
-   Rights Reserved.
-   
-   Contributor(s): 
-  -->
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % prefWalletDTD SYSTEM "chrome://communicator/locale/pref/pref-passwords.dtd" >
-%prefWalletDTD;
-]>
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-passwords.xul');">
-
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = ["signonRememberSignons", "encryptEnabled"];
-
-    function viewSignons()
-    {
-      window.openDialog("chrome://communicator/content/wallet/SignonViewer.xul","","modal=yes,chrome,resizable=yes", "S");
-    }
-
-    function changePasswords()
-    {
-      wallet = Components.classes['@mozilla.org/wallet;1'];
-      wallet = wallet.getService();
-      wallet = wallet.QueryInterface(Components.interfaces.nsIWalletService);
-      wallet.WALLET_ChangePassword();
-    }
-
-    function initReencryptCallback()
-    {
-      wallet = Components.classes['@mozilla.org/wallet/wallet-service;1'];
-      wallet = wallet.getService();
-      wallet = wallet.QueryInterface(Components.interfaces.nsIWalletService);
-      wallet.WALLET_InitReencryptCallback(window);
-    }
-
-  ]]>
-  </script>
-        
-  <box class="box-smallheader" title="&lHeader;"/>
-
-  <titledbox orient="vertical">
-    <label value="&signonHeader.label;"/>
-    <html flex="1">&signonDescription.label;</html>
-    <box autostretch="never">
-      <checkbox id="signonRememberSignons" label="&signonEnabled.label;" accesskey="&signonEnabled.accesskey;"
-                pref="true" preftype="bool" prefstring="signon.rememberSignons"
-                prefattribute="checked"/>
-    </box>
-    <box autostretch="never" halign="right">
-      <button class="dialog" label="&viewSignons.label;" accesskey="&viewSignons.accesskey;"
-              oncommand="viewSignons();"/>
-    </box>
-  </titledbox>
-
-  <titledbox orient="vertical">
-    <label value="&encryptHeader.label;"/>
-    <html flex="1">&encryptDescription.label;</html>
-    <box autostretch="never">
-      <checkbox id="encryptEnabled" label="&encryptEnabled.label;" accesskey="&encryptEnabled.accesskey;"
-                pref="true" preftype="bool" prefstring="wallet.crypto"
-                prefattribute="checked" oncommand="initReencryptCallback();"/>
-    </box>
-
-  </titledbox>
-
-</window>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul
deleted file mode 100644
index 2bfa93aa991..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?> 
-
-<!--
-   The contents of this file are subject to the Netscape Public
-   License Version 1.1 (the "License"); you may not use this file
-   except in compliance with the License. You may obtain a copy of
-   the License at http://www.mozilla.org/NPL/
-    
-   implied. See the License for the specific language governing
-   rights and limitations under the License.
-    
-   The Original Code is Mozilla Communicator client code, released
-   March 31, 1998.
-   
-   The Initial Developer of the Original Code is Netscape
-   Communications Corporation. Portions created by Netscape are
-   Copyright (C) 1998-1999 Netscape Communications Corporation. All
-   Rights Reserved.
-   
-   Contributor(s): 
-  -->
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % prefWalletDTD SYSTEM "chrome://communicator/locale/pref/pref-wallet.dtd" >
-%prefWalletDTD;
-]>
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical" title="&window.title;"
-        onload="parent.initPanel('chrome://communicator/content/pref/pref-wallet.xul');">
-
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = ["walletCaptureForms"];
-
-    function viewWallet()
-    {
-      window.openDialog(
-          "chrome://communicator/content/wallet/WalletViewer.xul",
-          "WalletViewer",
-          "chrome,titlebar,modal=yes,resizable=yes");
-    }
-
-    function viewWalletSites()
-    {
-      window.openDialog("chrome://communicator/content/wallet/SignonViewer.xul","","modal=yes,chrome,resizable=no", "W");
-    }
-
-  ]]>
-  </script>
-        
-  <box class="box-smallheader" title="&lHeader;"/>
-
-  <titledbox orient="vertical">
-    <label value="&walletHeader.label;"/>
-    <html>&walletDescription.label;</html>
-<!--
-    <box autostretch="never">
-      <text class="label" for="walletServer" value="&walletServer.label;" accesskey="&walletServer.accesskey;"/>
-      <textbox id="walletServer" flex="1"
-                 pref="true" preftype="string" prefstring="wallet.Server"
-                 prefattribute="value"/>
-    </box>
--->
-    <box autostretch="never">
-      <checkbox id="walletCaptureForms" label="&walletEnabled.label;" accesskey="&walletEnabled.accesskey;"
-                pref="true" preftype="bool" prefstring="wallet.captureForms"
-                prefattribute="checked"/>
-    </box>
-    <box autostretch="never" halign="right">
-      <button class="dialog" label="&viewWallet.label;" accesskey="&viewWallet.accesskey;" 
-              oncommand="viewWallet();"/>
-      <button class="dialog" label="&viewWalletSites.label;" accesskey="&viewWalletSites.accesskey;" 
-              oncommand="viewWalletSites();"/>
-    </box>
-  </titledbox>
-
-</window>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/prefutilities.js b/mozilla/xpfe/components/prefwindow/resources/content/prefutilities.js
deleted file mode 100644
index b783441d526..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/content/prefutilities.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY 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 Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- * Alec Flett <alecf@netscape.com>
- * Jason Eager <jce2@po.cwru.edu>
- */
-
-const nsIFilePicker = Components.interfaces.nsIFilePicker;
-const nsIFileURL    = Components.interfaces.nsIFileURL;
-
-function getFileOrFolderSpec( aTitle, aFolder )
-{
-  try {
-    var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-  }
-  catch(e) {
-    dump("*** failed to create fileSpecWithUI or fileSpec objects\n");
-    return false;
-  }
-
-  try {
-    var mode;
-    if (aFolder)
-      mode = nsIFilePicker.modeGetFolder;
-    else
-      mode = nsIFilePicker.modeOpen;
-
-    fp.init(window, aTitle, mode);
-    fp.appendFilters(nsIFilePicker.filterAll);
-    var ret = fp.show();
-    if (ret == nsIFilePicker.returnCancel)
-      return -1;
-  }
-  catch(e) {
-    dump("Error: " + e + "\n");
-    return -1;
-  }
-
-  return fp.file;
-}
-
-function prefNavSelectFile(folderFieldId, stringId, useNative)
-{
-  var folderField = document.getElementById(folderFieldId);
-  var dlgString = stringId ? bundle.GetStringFromName(stringId) : '';
-  var file = getFileOrFolderSpec( dlgString, false );
-  if( file != -1 )
-  {
-    /* XXX nsILocalFile doesn't have a URL string */
-    if (useNative)
-    {
-      folderField.value = file.unicodePath;
-    }
-    else
-    {
-      try {
-        var fileURL = Components.classes["@mozilla.org/network/standard-url;1"].createInstance(nsIFileURL);
-        fileURL.file = file;
-        var url = fileURL.spec;
-        if( url )
-          folderField.value = url;
-      }
-      catch(e) {
-      }
-    }
-  }
-}
-
-function setHomePageToCurrentPage(folderFieldId)
-{
-  var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"].getService(Components.interfaces.nsIWindowMediator);
-  var browserWindow = windowManager.getMostRecentWindow("navigator:browser");
-  if (browserWindow) {
-    var browser = browserWindow.document.getElementById("content");
-    var url = browser.webNavigation.currentURI.spec;
-    if (url) {
-      var homePageField = document.getElementById(folderFieldId);
-      homePageField.value = url;
-    }
-  }
-}
-
-function prefClearGlobalHistory()
-{
-  var globalHistory = Components.classes["@mozilla.org/browser/global-history;1"].getService(Components.interfaces.nsIBrowserHistory);
-  if (globalHistory)
-    globalHistory.removeAllPages();
-}
-
-function prefClearUrlbarHistory()
-{
-  var button = document.getElementById("ClearUrlBarHistoryButton");
-  var urlBarHist = Components.classes["@mozilla.org/browser/urlbarhistory;1"].getService(Components.interfaces.nsIUrlbarHistory);
-  if ( urlBarHist )
-  {
-    urlBarHist.clearHistory();
-    button.setAttribute("disabled","true");
-  }
-}  
-
-var bundle = srGetStrBundle("chrome://communicator/locale/pref/prefutilities.properties");
-
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
deleted file mode 100644
index eb9b3b18204..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
+++ /dev/null
@@ -1,27 +0,0 @@
-<!ENTITY lHeader                        "Cookies">
-
-<!-- cookies -->
-
-<!ENTITY cookiePolicy.label             "Cookie Acceptance Policy">
-
-<!ENTITY accAllCookiesRadio.label       "Enable all cookies">
-<!ENTITY accAllCookiesRadio.accesskey   "a">
-
-<!ENTITY accOrgCookiesRadio.label       "Enable cookies for the originating web site only">
-<!ENTITY accOrgCookiesRadio.accesskey   "o">
-
-<!ENTITY disableCookies.label           "Disable cookies">
-<!ENTITY disableCookies.accesskey       "r">
-
-<!ENTITY warnAboutCookies.label         "Warn me before storing a cookie">
-<!ENTITY warnAboutCookies.accesskey     "w">
-
-<!ENTITY cookieDetails                  "Cookies are small pieces of information that some web sites ask to store on your computer. If you enable cookies, your browser will accept a web site's cookies automatically when you visit the site. Such cookies are sent back to the web site on future visits.">
-
-<!ENTITY viewCookies.label              "View Stored Cookies">
-<!ENTITY viewCookies.accesskey          "v">
-
-<!ENTITY viewTutorial.label              "More Information">
-<!ENTITY viewTutorial.accesskey          "m">
-
-
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-images.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-images.dtd
deleted file mode 100644
index d0a76f1009d..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-images.dtd
+++ /dev/null
@@ -1,21 +0,0 @@
-<!ENTITY lHeader                        "Images">
-
-<!ENTITY imageBlocking.label            "Image Blocking">
-
-<!--LOCALIZATION NOTE (onStartLegend.label): Don't translate "&brandShortName;".
-    Place "&brandShortName;" in the phrase where the name of the application should
-	 appear
--->
-<!ENTITY imageDetails                   "Specify how &brandShortName; handles images on web pages.">
-
-<!ENTITY accAllImagesRadio.label        "Accept all images">
-<!ENTITY accAllImagesRadio.accesskey    "i">
-<!ENTITY accOrgImagesRadio.label        "Accept images that come from the originating server only">
-<!ENTITY accOrgImagesRadio.accesskey    "n">
-<!ENTITY disableImages.label            "Do not load any images">
-<!ENTITY disableImages.accesskey        "y">
-<!ENTITY warnAboutImages.label          "Alert me before downloading an image">
-<!ENTITY warnAboutImages.accesskey      "e">
-<!ENTITY viewImagesExplanation.label    "View list of sites about which image acceptance information is stored">
-<!ENTITY viewImages.label               "View Image Permissions">
-<!ENTITY viewImages.accesskey           "p">
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-passwords.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-passwords.dtd
deleted file mode 100644
index 1fc8358fdb6..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-passwords.dtd
+++ /dev/null
@@ -1,15 +0,0 @@
-<!ENTITY  lHeader                     "Passwords">
-<!ENTITY  rHeader                     "Manage passwords">
-
-<!ENTITY  signonHeader.label          "Password Manager">
-<!ENTITY  signonDescription.label     "Password Manager stores your usernames and passwords for sites that require you to log in, and enters them automatically when you visit those sites.">
-<!ENTITY  signonEnabled.label         "Remember passwords for sites that require me to log in.">
-<!ENTITY  signonEnabled.accesskey     "r">
-<!ENTITY  viewSignons.label           "View Stored Passwords">
-<!ENTITY  viewSignons.accesskey       "e">
-
-<!ENTITY  encryptHeader.label         "Encrypting versus Obscuring">
-<!ENTITY  encryptDescription.label    "Sensitive data that is stored on your hard disk can be encrypted to prevent the data from being read by an intruder.  A password is used to access the data.">
-<!ENTITY  encryptEnabled.label        "Use encryption when storing sensitive data.">
-<!ENTITY  encryptEnabled.accesskey    "n">
-
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-wallet.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-wallet.dtd
deleted file mode 100644
index 6ee7af4bb94..00000000000
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-wallet.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
-<!ENTITY  lHeader                     "Forms">
-<!ENTITY  rHeader                     "Manage personal information">
-
-<!ENTITY  walletHeader.label          "Form Manager">
-<!ENTITY  walletDescription.label     "Form Manager can remember information about you so that filling out forms on web pages is faster.">
-<!ENTITY  walletServer.label          "Server for Form Manager tables:">
-<!ENTITY  walletServer.accesskey      "s">
-<!ENTITY  walletEnabled.label         "Save form data from web pages when completing forms.">
-<!ENTITY  walletEnabled.accesskey     "f">
-<!ENTITY  viewWallet.label            "View Stored Form Data">
-<!ENTITY  viewWallet.accesskey        "v">
-<!ENTITY  viewWalletSites.label       "View Sites">
-<!ENTITY  viewWalletSites.accesskey   "w">
diff --git a/mozilla/xpfe/global/resources/content/scrollbarBindings.xml b/mozilla/xpfe/global/resources/content/scrollbarBindings.xml
index 953144fae60..6b958602cb0 100644
--- a/mozilla/xpfe/global/resources/content/scrollbarBindings.xml
+++ b/mozilla/xpfe/global/resources/content/scrollbarBindings.xml
@@ -5,140 +5,8 @@
    xmlns:html="http://www.w3.org/1999/xhtml"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-   <binding id="thumb" extends="xul:box">
-    <content>
-      <xul:spring flex="1"/>
-      <xul:image inherits="src"/>
-      <xul:spring flex="1"/>
-    </content>
-	<implementation implements="nsIAccessible">
-	  <method name="getAccDescription">
-        <body>
-          <![CDATA[
-		    return 'This is a scrollbars thumb';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccValue">
-        <body>
-          <![CDATA[
-		    return this.getAttribute('curpos');
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccName">
-        <body>
-          <![CDATA[
-		    return 'Thumb';
-          ]]>
-        </body>
-      </method>
-
- 	  <method name="getAccRole">
-        <body>
-          <![CDATA[
-		    return 'indicator';
-          ]]>
-        </body>
-      </method>
-
-	  <method name="getAccChildCount">
-        <body>
-          <![CDATA[
-		    return 0;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccFirstChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccLastChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
- 	</implementation>
-  </binding>
-
-   <binding id="scrollbarbutton">
-    <content>
-      <xul:box class="scrollbarbutton-box" flex="1">
-        <xul:image class="scrollbarbutton-icon" inherits="src"/>
-      </xul:box>
-    </content>
-
-	<implementation implements="nsIAccessible">
-	  <method name="getAccDefaultAction">
-        <body>
-          <![CDATA[
-		    return 'Click';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccDescription">
-        <body>
-          <![CDATA[
-		    return 'Adjusts scrollbar';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccName">
-        <body>
-          <![CDATA[
-		    return 'scrollbar button';
-          ]]>
-        </body>
-      </method>
-
-  	  <method name="getAccRole">
-        <body>
-          <![CDATA[
-		    return 'push button';
-          ]]>
-        </body>
-      </method>
-
-      <method name="accDoDefaultAction">
-        <body>
-          <![CDATA[
-		    this.click();
-			dump("We just clicked!!!\n");
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccChildCount">
-        <body>
-          <![CDATA[
-		    return 0;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccFirstChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccLastChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
- 	</implementation>
-
-  </binding>
-
   <binding id="scrollbar">
-	<implementation implements="nsIAccessible">
+    <implementation>
       <method name="initScrollbar">
         <body>
           <![CDATA[
@@ -198,42 +66,12 @@
 	  <constructor>
 	    this.initScrollbar();
 	  </constructor>
-
-	  <method name="getAccDescription">
-        <body>
-          <![CDATA[
-		    return 'This is a scrollbar';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccValue">
-        <body>
-          <![CDATA[
-		    return this.getAttribute('curpos');
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccName">
-        <body>
-          <![CDATA[
-		    return 'Scroll Bar';
-          ]]>
-        </body>
-      </method>
-
-   	  <method name="getAccRole">
-        <body>
-          <![CDATA[
-		    return 'scrollbar';
-          ]]>
-        </body>
-      </method>
-
     </implementation>
     <handlers>
       <handler event="contextmenu" action="event.preventDefault();"/>
     </handlers>
   </binding>
 
+
 </bindings>
 
diff --git a/mozilla/xpfe/global/resources/content/xulBindings.xml b/mozilla/xpfe/global/resources/content/xulBindings.xml
index cd62f112f08..02dd6cca982 100644
--- a/mozilla/xpfe/global/resources/content/xulBindings.xml
+++ b/mozilla/xpfe/global/resources/content/xulBindings.xml
@@ -10,6 +10,14 @@
    xmlns:html="http://www.w3.org/1999/xhtml"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
+  <binding id="thumb" extends="xul:box">
+    <content>
+      <xul:spring flex="1"/>
+      <xul:image inherits="src"/>
+      <xul:spring flex="1"/>
+    </content>
+  </binding>
+
   <binding id="slider">
     <content>
       <xul:thumb inherits="align,src" flex="1"/>
@@ -155,73 +163,6 @@
       </xul:box>
       <children includes="menupopup"/>
     </content>
-	<implementation implements="nsIAccessible">
-	  <method name="getAccDefaultAction">
-        <body>
-          <![CDATA[
-		    return 'Click';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccDescription">
-        <body>
-          <![CDATA[
-		    return 'This is a button that can be clicked to perform an action';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccValue">
-        <body>
-          <![CDATA[
-		    return this.getAttribute('value');
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccName">
-        <body>
-          <![CDATA[
-		    return 'Left Button';
-          ]]>
-        </body>
-      </method>
-
-  	  <method name="getAccRole">
-        <body>
-          <![CDATA[
-		    return 'push button';
-          ]]>
-        </body>
-      </method>
-
-      <method name="accDoDefaultAction">
-        <body>
-          <![CDATA[
-		    this.click();
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccChildCount">
-        <body>
-          <![CDATA[
-		    return 0;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccFirstChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccLastChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
- 	</implementation>
   </binding>
 
   <binding id="buttontop" extends="chrome://global/content/xulBindings.xml#basetext">
@@ -234,73 +175,6 @@
       </xul:box>
       <children includes="menupopup"/>
     </content>
-	<implementation implements="nsIAccessible">
-	  <method name="getAccDefaultAction">
-        <body>
-          <![CDATA[
-		    return 'Click';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccDescription">
-        <body>
-          <![CDATA[
-		    return 'This is a button that can be clicked to perform an action';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccValue">
-        <body>
-          <![CDATA[
-		    return this.getAttribute('value');
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccName">
-        <body>
-          <![CDATA[
-		    return 'Top Button';
-          ]]>
-        </body>
-      </method>
-
-  	  <method name="getAccRole">
-        <body>
-          <![CDATA[
-		    return 'push button';
-          ]]>
-        </body>
-      </method>
-
-      <method name="accDoDefaultAction">
-        <body>
-          <![CDATA[
-		    this.click();
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccChildCount">
-        <body>
-          <![CDATA[
-		    return 0;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccFirstChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccLastChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
- 	</implementation>
   </binding>
   
   <binding id="buttonright" extends="chrome://global/content/xulBindings.xml#basetext">
@@ -313,73 +187,6 @@
       </xul:box>
       <children includes="menupopup"/>
     </content>
-	<implementation implements="nsIAccessible">
-	  <method name="getAccDefaultAction">
-        <body>
-          <![CDATA[
-		    return 'Click';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccDescription">
-        <body>
-          <![CDATA[
-		    return 'This is a button that can be clicked to perform an action';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccValue">
-        <body>
-          <![CDATA[
-		    return this.getAttribute('value');
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccName">
-        <body>
-          <![CDATA[
-		    return 'Right Button';
-          ]]>
-        </body>
-      </method>
-
-   	  <method name="getAccRole">
-        <body>
-          <![CDATA[
-		    return 'push button';
-          ]]>
-        </body>
-      </method>
-
-      <method name="accDoDefaultAction">
-        <body>
-          <![CDATA[
-		    this.click();
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccChildCount">
-        <body>
-          <![CDATA[
-		    return 0;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccFirstChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccLastChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
- 	</implementation>
   </binding>
 
   <binding id="buttonbottom" extends="chrome://global/content/xulBindings.xml#basetext">
@@ -392,73 +199,6 @@
       </xul:box>
       <children includes="menupopup"/>
     </content>
-	<implementation implements="nsIAccessible">
-	  <method name="getAccDefaultAction">
-        <body>
-          <![CDATA[
-		    return 'Click';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccDescription">
-        <body>
-          <![CDATA[
-		    return 'This is a button that can be clicked to perform an action';
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccValue">
-        <body>
-          <![CDATA[
-		    return this.getAttribute('value');
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccName">
-        <body>
-          <![CDATA[
-		    return 'Bottom Button';
-          ]]>
-        </body>
-      </method>
-
-  	  <method name="getAccRole">
-        <body>
-          <![CDATA[
-		    return 'push button';
-          ]]>
-        </body>
-      </method>
-
-      <method name="accDoDefaultAction">
-        <body>
-          <![CDATA[
-		    this.click();
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccChildCount">
-        <body>
-          <![CDATA[
-		    return 0;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccFirstChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
-	  <method name="getAccLastChild">
-        <body>
-          <![CDATA[
-		    return null;
-          ]]>
-        </body>
-      </method>
- 	</implementation>
   </binding>
   
   <binding id="separator" extends="xul:spring"/>