Commit af12505a authored by Emilio Cobos Álvarez's avatar Emilio Cobos Álvarez
Browse files

Bug 1906132 - Explicitly set bresize bit when doing a measuring reflow. r=dholbert a=RyanVM 

This doesn't change behavior, but it is more explicit.

Make the two resize code-paths invalidate the same way.

Differential Revision: https://phabricator.services.mozilla.com/D215841
parent c2721044

layout/base/PresShell.cpp

+5 −16
Original line number Diff line number Diff line
@@ -779,7 +779,6 @@ PresShell::PresShell(Document* aDocument) 
      mIsDocumentGone(false),

      mHaveShutDown(false),

      mPaintingSuppressed(false),

      mLastRootReflowHadUnconstrainedBSize(false),

      mShouldUnsuppressPainting(false),

      mIgnoreFrameDestruction(false),

      mIsActive(true),
@@ -1927,6 +1926,7 @@ bool PresShell::SimpleResizeReflow(nscoord aWidth, nscoord aHeight) { 
      wm.IsVertical() ? oldSize.width != aWidth : oldSize.height != aHeight;

  if (isBSizeChanging) {

    nsLayoutUtils::MarkIntrinsicISizesDirtyIfDependentOnBSize(rootFrame);

    rootFrame->SetHasBSizeChange(true);

  }

  FrameNeedsReflow(rootFrame, IntrinsicDirty::None,

                   NS_FRAME_HAS_DIRTY_CHILDREN);
@@ -2037,6 +2037,9 @@ bool PresShell::ResizeReflowIgnoreOverride(nscoord aWidth, nscoord aHeight, 
  // intrinsic sizes can't depend on them. So the only other case is

  // viewport-controlled BSizes which we handle here.

  nsLayoutUtils::MarkIntrinsicISizesDirtyIfDependentOnBSize(rootFrame);

  rootFrame->SetHasBSizeChange(true);

  FrameNeedsReflow(rootFrame, IntrinsicDirty::None,

                   NS_FRAME_HAS_DIRTY_CHILDREN);



  {

    nsAutoCauseReflowNotifier crNotifier(this);
@@ -2055,6 +2058,7 @@ bool PresShell::ResizeReflowIgnoreOverride(nscoord aWidth, nscoord aHeight, 


    if (reflowAgain) {

      mPresContext->SetVisibleArea(nsRect(0, 0, aWidth, aHeight));

      rootFrame->SetHasBSizeChange(true);

      DoReflow(rootFrame, true, nullptr);

    }

  }
@@ -9785,21 +9789,6 @@ bool PresShell::DoReflow(nsIFrame* target, bool aInterruptible, 


  if (isRoot) {

    reflowInput.Init(mPresContext);



    // When the root frame is being reflowed with unconstrained block-size

    // (which happens when we're called from

    // nsDocumentViewer::SizeToContent), we're effectively doing a

    // resize in the block direction, since it changes the meaning of

    // percentage block-sizes even if no block-sizes actually changed.

    // The same applies when we reflow again after that computation. This is

    // an unusual case, and isn't caught by ReflowInput::InitResizeFlags.

    bool hasUnconstrainedBSize = size.BSize(wm) == NS_UNCONSTRAINEDSIZE;



    if (hasUnconstrainedBSize || mLastRootReflowHadUnconstrainedBSize) {

      reflowInput.SetBResize(true);

    }



    mLastRootReflowHadUnconstrainedBSize = hasUnconstrainedBSize;

  } else {

    // Initialize reflow input with current used border and padding,

    // in case this was set specially by the parent frame when the reflow root

layout/base/PresShell.h

+0 −2
Original line number Diff line number Diff line
@@ -3142,8 +3142,6 @@ class PresShell final : public nsStubDocumentObserver, 
  // For all documents we initially lock down painting.

  bool mPaintingSuppressed : 1;



  bool mLastRootReflowHadUnconstrainedBSize : 1;



  // Indicates that it is safe to unlock painting once all pending reflows

  // have been processed.

  bool mShouldUnsuppressPainting : 1;