From 1b16b68ea7b17ae7b538a6cd88c0f4dcd50ab901 Mon Sep 17 00:00:00 2001 From: Matt Woodrow Date: Thu, 25 Aug 2016 14:25:11 +1200 Subject: [PATCH] Backout 4f90fc4e6063 for having the wrong commit message --- layout/generic/nsGfxScrollFrame.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index d4c39e6b945e..2107311268a6 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -1034,16 +1034,6 @@ nsHTMLScrollFrame::Reflow(nsPresContext* aPresContext, ReflowContents(&state, aDesiredSize); - aDesiredSize.Width() = state.mInsideBorderSize.width + - state.mComputedBorder.LeftRight(); - aDesiredSize.Height() = state.mInsideBorderSize.height + - state.mComputedBorder.TopBottom(); - - // Set the size of the frame now since computing the perspective-correct - // overflow (within PlaceScrollArea) can rely on it. - SetSize(aDesiredSize.GetWritingMode(), - aDesiredSize.Size(aDesiredSize.GetWritingMode())); - // Restore the old scroll position, for now, even if that's not valid anymore // because we changed size. We'll fix it up in a post-reflow callback, because // our current size may only be temporary (e.g. we're compute XUL desired sizes). @@ -1083,6 +1073,11 @@ nsHTMLScrollFrame::Reflow(nsPresContext* aPresContext, } } + aDesiredSize.Width() = state.mInsideBorderSize.width + + state.mComputedBorder.LeftRight(); + aDesiredSize.Height() = state.mInsideBorderSize.height + + state.mComputedBorder.TopBottom(); + aDesiredSize.SetOverflowAreasToDesiredBounds(); if (mHelper.IsIgnoringViewportClipping()) { aDesiredSize.mOverflowAreas.UnionWith(