From 2a36650bb65bbed65eb1ccd9be253a871d5a718e Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Wed, 23 Jul 2003 22:46:48 +0000 Subject: [PATCH] Back out part of checkin from yesterday due to regressions. b=79315 git-svn-id: svn://10.0.0.236/trunk@145127 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsLineLayout.cpp | 7 +++++++ mozilla/layout/html/base/src/nsLineLayout.cpp | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp index 8a7abb7bb6b..5a325e4c4a4 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -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); diff --git a/mozilla/layout/html/base/src/nsLineLayout.cpp b/mozilla/layout/html/base/src/nsLineLayout.cpp index 8a7abb7bb6b..5a325e4c4a4 100644 --- a/mozilla/layout/html/base/src/nsLineLayout.cpp +++ b/mozilla/layout/html/base/src/nsLineLayout.cpp @@ -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);