Backed out changeset 5bffc31ff797 (bug 433373) -- first attempt didn't handle page scaling correctly.

layout/generic/nsPageFrame.cpp

@@ -559,11 +559,7 @@ nsPageFrame::PaintPageContent(nsIRenderingContext& aRenderingContext,
     // We're doing print-selection, with one long page-content frame.
     // Clip to the appropriate page-content slice for the current page.
     NS_ASSERTION(mPageNum > 0, "page num should be positive");
-    // Note: The pageContentFrame's y-position has been set such that a zero
-    // y-value matches the top edge of the current page.  So, to clip to the
-    // current page's content (in coordinates *relative* to the page content
-    // frame), we just negate its y-position and add the top margin.
-    clipRect.y = -pageContentFrame->GetRect().y + mPD->mReflowMargin.top;
+    clipRect.y =  expectedPageContentHeight * (mPageNum - 1);
     clipRect.height = expectedPageContentHeight;
     NS_ASSERTION(clipRect.y < pageContentFrame->GetSize().height,
                  "Should be clipping to region inside the page content bounds");