From ece61958ac522a93926a731343344c3222069704 Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Wed, 5 Aug 2015 21:04:38 -0700 Subject: [PATCH] Bug 451791 patch 1 - Remove write-only nsHTMLReflowState::mFlags::mHasClearance. r=roc This was introduced in bug 209694 (gecko-dev 13a65028) but became unused through bug 292295 (gecko-dev 4593df2a57) and bug 300030 (gecko-dev 31f18988). --- layout/generic/nsBlockFrame.cpp | 1 - layout/generic/nsHTMLReflowState.cpp | 1 - layout/generic/nsHTMLReflowState.h | 1 - 3 files changed, 3 deletions(-) diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index f236df359a6..d98be89332b 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -3313,7 +3313,6 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState, nsHTMLReflowState blockHtmlRS(aState.mPresContext, aState.mReflowState, frame, availSpace.Size(wm).ConvertTo(frame->GetWritingMode(), wm)); - blockHtmlRS.mFlags.mHasClearance = aLine->HasClearance(); nsFloatManager::SavedState floatManagerState; nsReflowStatus frameReflowStatus; diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp index 28b5795309c..19a4f438b53 100644 --- a/layout/generic/nsHTMLReflowState.cpp +++ b/layout/generic/nsHTMLReflowState.cpp @@ -217,7 +217,6 @@ nsHTMLReflowState::nsHTMLReflowState( mFlags.mNextInFlowUntouched = aParentReflowState.mFlags.mNextInFlowUntouched && CheckNextInFlowParenthood(aFrame, aParentReflowState.frame); mFlags.mAssumingHScrollbar = mFlags.mAssumingVScrollbar = false; - mFlags.mHasClearance = false; mFlags.mIsColumnBalancing = false; mFlags.mIsFlexContainerMeasuringHeight = false; mFlags.mDummyParentReflowState = false; diff --git a/layout/generic/nsHTMLReflowState.h b/layout/generic/nsHTMLReflowState.h index 40b12742be8..9a017546bb6 100644 --- a/layout/generic/nsHTMLReflowState.h +++ b/layout/generic/nsHTMLReflowState.h @@ -553,7 +553,6 @@ public: // page? When true, we force something // that's too tall for a page/column to // fit anyway to avoid infinite loops. - uint16_t mHasClearance:1; // Block has clearance uint16_t mAssumingHScrollbar:1; // parent frame is an nsIScrollableFrame and it // is assuming a horizontal scrollbar uint16_t mAssumingVScrollbar:1; // parent frame is an nsIScrollableFrame and it