wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

merging from an aborted push for bug 474016

Browse Source
This commit is contained in:
Clint Talbert 2009-02-26 16:15:54 -08:00
commit 8fa526c5f4
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/src/nsDocument.cpp
View File

@ -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;
}

2
docshell/test/chrome/bug113934_window.xul
View File

@ -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;
}

4
layout/generic/nsPageFrame.cpp
View File

@ -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)