diff --git a/layout/generic/nsPageContentFrame.cpp b/layout/generic/nsPageContentFrame.cpp
new file mode 100644
index 00000000000..b5f9bd76fb3
--- /dev/null
+++ b/layout/generic/nsPageContentFrame.cpp
@@ -0,0 +1,171 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include "nsPageContentFrame.h"
+#include "nsHTMLParts.h"
+#include "nsIContent.h"
+#include "nsIPresContext.h"
+#include "nsIStyleContext.h"
+#include "nsIRenderingContext.h"
+#include "nsHTMLAtoms.h"
+#include "nsHTMLIIDs.h"
+#include "nsLayoutAtoms.h"
+#include "nsIStyleSet.h"
+#include "nsIPresShell.h"
+#include "nsIDeviceContext.h"
+#include "nsReadableUtils.h"
+#include "nsIPrintPreviewContext.h"
+
+#include "nsIView.h"
+
+#if defined(DEBUG_rods) || defined(DEBUG_dcone)
+#define DEBUG_PRINTING
+#endif
+
+
+nsresult
+NS_NewPageContentFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
+{
+  NS_PRECONDITION(aNewFrame, "null OUT ptr");
+
+  nsPageContentFrame* it = new (aPresShell) nsPageContentFrame;
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  *aNewFrame = it;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsPageContentFrame::Reflow(nsIPresContext*   aPresContext,
+                                  nsHTMLReflowMetrics&     aDesiredSize,
+                                  const nsHTMLReflowState& aReflowState,
+                                  nsReflowStatus&          aStatus)
+{
+  DO_GLOBAL_REFLOW_COUNT("nsPageContentFrame", aReflowState.reason);
+  DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
+  aStatus = NS_FRAME_COMPLETE;  // initialize out parameter
+
+  if (eReflowReason_Incremental != aReflowState.reason) {
+    // Resize our frame allowing it only to be as big as we are
+    // XXX Pay attention to the page's border and padding...
+    if (mFrames.NotEmpty()) {
+      nsIFrame* frame = mFrames.FirstChild();
+      nsSize  maxSize(aReflowState.availableWidth, aReflowState.availableHeight);
+      nsHTMLReflowState kidReflowState(aPresContext, aReflowState, frame, maxSize);
+
+      // Get the child's desired size
+      ReflowChild(frame, aPresContext, aDesiredSize, kidReflowState, 0, 0, 0, aStatus);
+
+      // Place and size the child
+      FinishReflowChild(frame, aPresContext, &kidReflowState, aDesiredSize, 0, 0, 0);
+
+#ifdef NS_DEBUG
+      // Is the frame complete?
+      if (NS_FRAME_IS_COMPLETE(aStatus)) {
+        nsIFrame* childNextInFlow;
+
+        frame->GetNextInFlow(&childNextInFlow);
+        NS_ASSERTION(nsnull == childNextInFlow, "bad child flow list");
+      }
+#endif
+
+#ifdef DEBUG_PRINTING
+      nsRect r;
+      frame->GetRect(r);
+      printf("PCF: Area Frame %p Bounds: %5d,%5d,%5d,%5d\n", frame, r.x, r.y, r.width, r.height);
+      nsIView* view;
+      frame->GetView(aPresContext, &view);
+      if (view) {
+        view->GetBounds(r);
+        printf("PCF: Area Frame View Bounds: %5d,%5d,%5d,%5d\n", r.x, r.y, r.width, r.height);
+      } else {
+        printf("PCF: Area Frame View Bounds: NO VIEW\n");
+      }
+#endif
+    }
+    // Return our desired size
+    aDesiredSize.width = aReflowState.availableWidth;
+    aDesiredSize.height = aReflowState.availableHeight;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPageContentFrame::GetFrameType(nsIAtom** aType) const
+{
+  NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
+  *aType = nsLayoutAtoms::pageContentFrame; 
+  NS_ADDREF(*aType);
+  return NS_OK;
+}
+
+#ifdef DEBUG
+NS_IMETHODIMP
+nsPageContentFrame::GetFrameName(nsAString& aResult) const
+{
+  return MakeFrameName(NS_LITERAL_STRING("PageContent"), aResult);
+}
+#endif
+
+NS_IMETHODIMP
+nsPageContentFrame::IsPercentageBase(PRBool& aBase) const
+{
+  aBase = PR_TRUE;
+  return NS_OK;
+}
+
+
+//------------------------------------------------------------------------------
+NS_IMETHODIMP
+nsPageContentFrame::Paint(nsIPresContext*      aPresContext,
+                   nsIRenderingContext& aRenderingContext,
+                   const nsRect&        aDirtyRect,
+                   nsFramePaintLayer    aWhichLayer,
+                   PRUint32             aFlags)
+{
+  PRBool clipEmpty;
+  aRenderingContext.PushState();
+  nsRect rect(0, 0, mRect.width, mRect.height);
+  aRenderingContext.SetClipRect(rect, nsClipCombine_kReplace, clipEmpty);
+
+  nsresult rv = nsContainerFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
+  aRenderingContext.PopState(clipEmpty);
+  return rv;
+}
+
+
+
diff --git a/layout/generic/nsPageContentFrame.h b/layout/generic/nsPageContentFrame.h
new file mode 100644
index 00000000000..c2a9ca2d9dd
--- /dev/null
+++ b/layout/generic/nsPageContentFrame.h
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef nsPageContentFrame_h___
+#define nsPageContentFrame_h___
+
+#include "nsContainerFrame.h"
+class nsPageFrame;
+
+// Page frame class used by the simple page sequence frame
+class nsPageContentFrame : public nsContainerFrame {
+
+public:
+  friend nsresult NS_NewPageContentFrame(nsIPresShell* aPresShell, nsIFrame** aResult);
+  friend class nsPageFrame;
+
+  // nsIFrame
+  NS_IMETHOD  Reflow(nsIPresContext*      aPresContext,
+                     nsHTMLReflowMetrics& aDesiredSize,
+                     const nsHTMLReflowState& aMaxSize,
+                     nsReflowStatus&      aStatus);
+
+  NS_IMETHOD  Paint(nsIPresContext*      aPresContext,
+                    nsIRenderingContext& aRenderingContext,
+                    const nsRect&        aDirtyRect,
+                    nsFramePaintLayer    aWhichLayer,
+                    PRUint32             aFlags = 0);
+
+  NS_IMETHOD IsPercentageBase(PRBool& aBase) const;
+
+  /**
+   * Get the "type" of the frame
+   *
+   * @see nsLayoutAtoms::pageFrame
+   */
+  NS_IMETHOD GetFrameType(nsIAtom** aType) const;
+  
+#ifdef NS_DEBUG
+  // Debugging
+  NS_IMETHOD  GetFrameName(nsAString& aResult) const;
+#endif
+
+};
+
+#endif /* nsPageContentFrame_h___ */
+
diff --git a/layout/html/base/src/nsPageContentFrame.cpp b/layout/html/base/src/nsPageContentFrame.cpp
new file mode 100644
index 00000000000..b5f9bd76fb3
--- /dev/null
+++ b/layout/html/base/src/nsPageContentFrame.cpp
@@ -0,0 +1,171 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include "nsPageContentFrame.h"
+#include "nsHTMLParts.h"
+#include "nsIContent.h"
+#include "nsIPresContext.h"
+#include "nsIStyleContext.h"
+#include "nsIRenderingContext.h"
+#include "nsHTMLAtoms.h"
+#include "nsHTMLIIDs.h"
+#include "nsLayoutAtoms.h"
+#include "nsIStyleSet.h"
+#include "nsIPresShell.h"
+#include "nsIDeviceContext.h"
+#include "nsReadableUtils.h"
+#include "nsIPrintPreviewContext.h"
+
+#include "nsIView.h"
+
+#if defined(DEBUG_rods) || defined(DEBUG_dcone)
+#define DEBUG_PRINTING
+#endif
+
+
+nsresult
+NS_NewPageContentFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
+{
+  NS_PRECONDITION(aNewFrame, "null OUT ptr");
+
+  nsPageContentFrame* it = new (aPresShell) nsPageContentFrame;
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  *aNewFrame = it;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsPageContentFrame::Reflow(nsIPresContext*   aPresContext,
+                                  nsHTMLReflowMetrics&     aDesiredSize,
+                                  const nsHTMLReflowState& aReflowState,
+                                  nsReflowStatus&          aStatus)
+{
+  DO_GLOBAL_REFLOW_COUNT("nsPageContentFrame", aReflowState.reason);
+  DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
+  aStatus = NS_FRAME_COMPLETE;  // initialize out parameter
+
+  if (eReflowReason_Incremental != aReflowState.reason) {
+    // Resize our frame allowing it only to be as big as we are
+    // XXX Pay attention to the page's border and padding...
+    if (mFrames.NotEmpty()) {
+      nsIFrame* frame = mFrames.FirstChild();
+      nsSize  maxSize(aReflowState.availableWidth, aReflowState.availableHeight);
+      nsHTMLReflowState kidReflowState(aPresContext, aReflowState, frame, maxSize);
+
+      // Get the child's desired size
+      ReflowChild(frame, aPresContext, aDesiredSize, kidReflowState, 0, 0, 0, aStatus);
+
+      // Place and size the child
+      FinishReflowChild(frame, aPresContext, &kidReflowState, aDesiredSize, 0, 0, 0);
+
+#ifdef NS_DEBUG
+      // Is the frame complete?
+      if (NS_FRAME_IS_COMPLETE(aStatus)) {
+        nsIFrame* childNextInFlow;
+
+        frame->GetNextInFlow(&childNextInFlow);
+        NS_ASSERTION(nsnull == childNextInFlow, "bad child flow list");
+      }
+#endif
+
+#ifdef DEBUG_PRINTING
+      nsRect r;
+      frame->GetRect(r);
+      printf("PCF: Area Frame %p Bounds: %5d,%5d,%5d,%5d\n", frame, r.x, r.y, r.width, r.height);
+      nsIView* view;
+      frame->GetView(aPresContext, &view);
+      if (view) {
+        view->GetBounds(r);
+        printf("PCF: Area Frame View Bounds: %5d,%5d,%5d,%5d\n", r.x, r.y, r.width, r.height);
+      } else {
+        printf("PCF: Area Frame View Bounds: NO VIEW\n");
+      }
+#endif
+    }
+    // Return our desired size
+    aDesiredSize.width = aReflowState.availableWidth;
+    aDesiredSize.height = aReflowState.availableHeight;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPageContentFrame::GetFrameType(nsIAtom** aType) const
+{
+  NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
+  *aType = nsLayoutAtoms::pageContentFrame; 
+  NS_ADDREF(*aType);
+  return NS_OK;
+}
+
+#ifdef DEBUG
+NS_IMETHODIMP
+nsPageContentFrame::GetFrameName(nsAString& aResult) const
+{
+  return MakeFrameName(NS_LITERAL_STRING("PageContent"), aResult);
+}
+#endif
+
+NS_IMETHODIMP
+nsPageContentFrame::IsPercentageBase(PRBool& aBase) const
+{
+  aBase = PR_TRUE;
+  return NS_OK;
+}
+
+
+//------------------------------------------------------------------------------
+NS_IMETHODIMP
+nsPageContentFrame::Paint(nsIPresContext*      aPresContext,
+                   nsIRenderingContext& aRenderingContext,
+                   const nsRect&        aDirtyRect,
+                   nsFramePaintLayer    aWhichLayer,
+                   PRUint32             aFlags)
+{
+  PRBool clipEmpty;
+  aRenderingContext.PushState();
+  nsRect rect(0, 0, mRect.width, mRect.height);
+  aRenderingContext.SetClipRect(rect, nsClipCombine_kReplace, clipEmpty);
+
+  nsresult rv = nsContainerFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
+  aRenderingContext.PopState(clipEmpty);
+  return rv;
+}
+
+
+
diff --git a/layout/html/base/src/nsPageContentFrame.h b/layout/html/base/src/nsPageContentFrame.h
new file mode 100644
index 00000000000..c2a9ca2d9dd
--- /dev/null
+++ b/layout/html/base/src/nsPageContentFrame.h
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * 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 the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#ifndef nsPageContentFrame_h___
+#define nsPageContentFrame_h___
+
+#include "nsContainerFrame.h"
+class nsPageFrame;
+
+// Page frame class used by the simple page sequence frame
+class nsPageContentFrame : public nsContainerFrame {
+
+public:
+  friend nsresult NS_NewPageContentFrame(nsIPresShell* aPresShell, nsIFrame** aResult);
+  friend class nsPageFrame;
+
+  // nsIFrame
+  NS_IMETHOD  Reflow(nsIPresContext*      aPresContext,
+                     nsHTMLReflowMetrics& aDesiredSize,
+                     const nsHTMLReflowState& aMaxSize,
+                     nsReflowStatus&      aStatus);
+
+  NS_IMETHOD  Paint(nsIPresContext*      aPresContext,
+                    nsIRenderingContext& aRenderingContext,
+                    const nsRect&        aDirtyRect,
+                    nsFramePaintLayer    aWhichLayer,
+                    PRUint32             aFlags = 0);
+
+  NS_IMETHOD IsPercentageBase(PRBool& aBase) const;
+
+  /**
+   * Get the "type" of the frame
+   *
+   * @see nsLayoutAtoms::pageFrame
+   */
+  NS_IMETHOD GetFrameType(nsIAtom** aType) const;
+  
+#ifdef NS_DEBUG
+  // Debugging
+  NS_IMETHOD  GetFrameName(nsAString& aResult) const;
+#endif
+
+};
+
+#endif /* nsPageContentFrame_h___ */
+