merging from an aborted push for bug 474016

content/base/src/nsDocument.cpp

@@ -7175,6 +7175,8 @@ nsDocument::OnPageShow(PRBool aPersisted, nsIDOMEventTarget* aDispatchStartTarge
 
   // See nsIDocument
   if (!aDispatchStartTarget) {
+    // Set mIsShowing before firing events, in case those event handlers
+    // move us around.
     mIsShowing = PR_TRUE;
   }
  
@@ -7217,6 +7219,8 @@ nsDocument::OnPageHide(PRBool aPersisted, nsIDOMEventTarget* aDispatchStartTarge
 
   // See nsIDocument
   if (!aDispatchStartTarget) {
+    // Set mIsShowing before firing events, in case those event handlers
+    // move us around.
     mIsShowing = PR_FALSE;
   }
 

docshell/test/chrome/bug113934_window.xul

@@ -98,7 +98,7 @@
               node.addEventListener("page" + type, listener, false);
 
               listener.detach = function() {
-	node.removeEventListener("page" + type, listener, false);
+                node.removeEventListener("page" + type, listener, false);
               }
               return listener;
             }

layout/generic/nsPageFrame.cpp

@@ -80,7 +80,7 @@ nsPageFrame::~nsPageFrame()
 {
 }
 
-NS_IMETHODIMP nsPageFrame::Reflow(nsPresContext*          aPresContext,
+NS_IMETHODIMP nsPageFrame::Reflow(nsPresContext*           aPresContext,
                                   nsHTMLReflowMetrics&     aDesiredSize,
                                   const nsHTMLReflowState& aReflowState,
                                   nsReflowStatus&          aStatus)
@@ -628,7 +628,7 @@ nsPageBreakFrame::GetIntrinsicHeight()
 }
 
 nsresult 
-nsPageBreakFrame::Reflow(nsPresContext*          aPresContext,
+nsPageBreakFrame::Reflow(nsPresContext*           aPresContext,
                          nsHTMLReflowMetrics&     aDesiredSize,
                          const nsHTMLReflowState& aReflowState,
                          nsReflowStatus&          aStatus)