From eb511503219bccaaa64ca60ba478e6815fa9a2bd Mon Sep 17 00:00:00 2001 From: "troy@netscape.com" Date: Sat, 17 Oct 1998 04:00:58 +0000 Subject: [PATCH] Changed a SetFrameState call to not clobber the NS_FRAME_SYNC_FRAME_AND_VIEW flag --- layout/generic/nsFrameSetFrame.cpp | 6 +++++- layout/html/document/src/nsFrameSetFrame.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp index 36aebb66d3c0..250ba4268731 100644 --- a/layout/generic/nsFrameSetFrame.cpp +++ b/layout/generic/nsFrameSetFrame.cpp @@ -693,7 +693,11 @@ nsHTMLFramesetFrame::ReflowPlaceChild(nsIFrame* aChild, // Place and size the child nsRect rect(aOffset.x, aOffset.y, aSize.width, aSize.height); - aChild->SetFrameState(0); + // XXX We shouldn't just whack the frame set bits. Clear just the bits + // we need to clear... +#if 0 + aChild->SetFrameState(NS_FRAME_SYNC_FRAME_AND_VIEW); +#endif aChild->SetRect(rect); htmlReflow->DidReflow(aPresContext, NS_FRAME_REFLOW_FINISHED); // XXX do we need this } diff --git a/layout/html/document/src/nsFrameSetFrame.cpp b/layout/html/document/src/nsFrameSetFrame.cpp index 36aebb66d3c0..250ba4268731 100644 --- a/layout/html/document/src/nsFrameSetFrame.cpp +++ b/layout/html/document/src/nsFrameSetFrame.cpp @@ -693,7 +693,11 @@ nsHTMLFramesetFrame::ReflowPlaceChild(nsIFrame* aChild, // Place and size the child nsRect rect(aOffset.x, aOffset.y, aSize.width, aSize.height); - aChild->SetFrameState(0); + // XXX We shouldn't just whack the frame set bits. Clear just the bits + // we need to clear... +#if 0 + aChild->SetFrameState(NS_FRAME_SYNC_FRAME_AND_VIEW); +#endif aChild->SetRect(rect); htmlReflow->DidReflow(aPresContext, NS_FRAME_REFLOW_FINISHED); // XXX do we need this }