Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out part of checkin from yesterday due to regressions. b=79315

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@145127 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2003-07-23 22:46:48 +00:00
parent bc1e83b697
commit 2a36650bb6
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/layout/generic/nsLineLayout.cpp
View File

@@ -1221,6 +1221,13 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
// Size the frame, but |RelativePositionFrames| will size the view.
aFrame->SetSize(nsSize(metrics.width, metrics.height));
// XXX We shouldn't need to size the view because
// |RelativePositionFrames| does it, but we need to. See
// http://bugzilla.mozilla.org/show_bug.cgi?id=79315#c67
if (aFrame->HasView()) {
nsIView* view = aFrame->GetView();
view->GetViewManager()->ResizeView(view, pfd->mCombinedArea);
}
// Tell the frame that we're done reflowing it
aFrame->DidReflow(mPresContext, &reflowState, NS_FRAME_REFLOW_FINISHED);

7
mozilla/layout/html/base/src/nsLineLayout.cpp
View File

@@ -1221,6 +1221,13 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
// Size the frame, but |RelativePositionFrames| will size the view.
aFrame->SetSize(nsSize(metrics.width, metrics.height));
// XXX We shouldn't need to size the view because
// |RelativePositionFrames| does it, but we need to. See
// http://bugzilla.mozilla.org/show_bug.cgi?id=79315#c67
if (aFrame->HasView()) {
nsIView* view = aFrame->GetView();
view->GetViewManager()->ResizeView(view, pfd->mCombinedArea);
}
// Tell the frame that we're done reflowing it
aFrame->DidReflow(mPresContext, &reflowState, NS_FRAME_REFLOW_FINISHED);