From c523e0fd7272d78c4d5d4ac3f65332bcbcd88781 Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Thu, 26 Feb 2009 15:47:03 -0800 Subject: [PATCH 1/2] whitespace-only: fix indentation of 'aPresContext' arguments in function headers within nsPageFrame.cpp --- layout/generic/nsPageFrame.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp index 4e55356e8a5..f38f5f7c3f2 100644 --- a/layout/generic/nsPageFrame.cpp +++ b/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) From db12334cedf7daaba9a19e965ddea78c67d398d4 Mon Sep 17 00:00:00 2001 From: Asaf Romano Date: Thu, 26 Feb 2009 16:01:11 -0800 Subject: [PATCH 2/2] comments and a hard-tab fix --- content/base/src/nsDocument.cpp | 4 ++++ docshell/test/chrome/bug113934_window.xul | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 98efc9a1251..769a621bb76 100644 --- a/content/base/src/nsDocument.cpp +++ b/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; } diff --git a/docshell/test/chrome/bug113934_window.xul b/docshell/test/chrome/bug113934_window.xul index 5390861041e..4f6e79688ae 100644 --- a/docshell/test/chrome/bug113934_window.xul +++ b/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; }