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

Bug 375273: minor code cleanup in nsContainerFrame. r+sr=roc

Browse Source
This commit is contained in:
sharparrow1@yahoo.com 2007-03-25 18:12:49 -07:00
parent 59eb3fc8d6
commit bdebedc073
2 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/base/nsPresShell.cpp
View File

@ -2556,7 +2556,7 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight)
mPresContext->SetVisibleArea(nsRect(0,0,desiredSize.width,desiredSize.height));
nsContainerFrame::SyncFrameViewAfterReflow(mPresContext, rootFrame, rootFrame->GetView(),
nsnull);
&desiredSize.mOverflowArea);
rootFrame->DidReflow(mPresContext, nsnull, NS_FRAME_REFLOW_FINISHED);
#ifdef NS_DEBUG
@ -2705,7 +2705,7 @@ PresShell::ResizeReflow(nscoord aWidth, nscoord aHeight)
mPresContext->SetVisibleArea(nsRect(0,0,desiredSize.width,desiredSize.height));
nsContainerFrame::SyncFrameViewAfterReflow(mPresContext, rootFrame, rootFrame->GetView(),
nsnull);
&desiredSize.mOverflowArea);
rootFrame->DidReflow(mPresContext, nsnull, NS_FRAME_REFLOW_FINISHED);
#ifdef NS_DEBUG
if (nsIFrameDebug::GetVerifyTreeEnable()) {
@ -3166,7 +3166,7 @@ PresShell::StyleChangeReflow()
mPresContext->SetVisibleArea(nsRect(0,0,desiredSize.width,desiredSize.height));
nsIView* view = rootFrame->GetView();
nsContainerFrame::SyncFrameViewAfterReflow(mPresContext, rootFrame, view,
nsnull);
&desiredSize.mOverflowArea);
rootFrame->DidReflow(mPresContext, nsnull, NS_FRAME_REFLOW_FINISHED);
#ifdef NS_DEBUG
if (nsIFrameDebug::GetVerifyTreeEnable()) {

38
layout/generic/nsContainerFrame.cpp
View File

@ -485,28 +485,6 @@ SyncFrameViewGeometryDependentProperties(nsPresContext* aPresContext,
}
}
// XXX we should also set widget transparency for XUL popups
nsFrameState kidState = aFrame->GetStateBits();
PRBool isBlockLevel =
display->IsBlockLevel() || (kidState & NS_FRAME_OUT_OF_FLOW);
if (!viewHasTransparentContent) {
const nsStyleVisibility* vis = aStyleContext->GetStyleVisibility();
if (// If we're showing the view but the frame is hidden, then the
// view is transparent
(nsViewVisibility_kShow == aView->GetVisibility() &&
NS_STYLE_VISIBILITY_HIDDEN == vis->mVisible)) {
viewHasTransparentContent = PR_TRUE;
} else {
PRBool isScrolledContent = aView->GetParent() &&
aView->GetParent()->ToScrollableView();
// If we have overflowing kids and we're not clipped by a parent
// scrolling view, then the view must be transparent.
if (!isScrolledContent && (kidState & NS_FRAME_OUTSIDE_CHILDREN)) {
viewHasTransparentContent = PR_TRUE;
}
}
}
}
void
@ -520,6 +498,8 @@ nsContainerFrame::SyncFrameViewAfterReflow(nsPresContext* aPresContext,
return;
}
NS_ASSERTION(aCombinedArea, "Combined area must be passed in now");
// Make sure the view is sized and positioned correctly
if (0 == (aFlags & NS_FRAME_NO_MOVE_VIEW)) {
PositionFrameView(aFrame);
@ -528,19 +508,7 @@ nsContainerFrame::SyncFrameViewAfterReflow(nsPresContext* aPresContext,
if (0 == (aFlags & NS_FRAME_NO_SIZE_VIEW)) {
nsIViewManager* vm = aView->GetViewManager();
// If the frame has child frames that stick outside the content
// area, then size the view large enough to include those child
// frames
NS_ASSERTION(!(aFrame->GetStateBits() & NS_FRAME_OUTSIDE_CHILDREN) ||
aCombinedArea,
"resizing view for frame with overflow to the wrong size");
if ((aFrame->GetStateBits() & NS_FRAME_OUTSIDE_CHILDREN) && aCombinedArea) {
vm->ResizeView(aView, *aCombinedArea, PR_TRUE);
} else {
nsSize frameSize = aFrame->GetSize();
nsRect newSize(0, 0, frameSize.width, frameSize.height);
vm->ResizeView(aView, newSize, PR_TRUE);
}
vm->ResizeView(aView, *aCombinedArea, PR_TRUE);
// Even if the size hasn't changed, we need to sync up the
// geometry dependent properties, because (kidState &