Bug 1469738 - Part 1: Remove always-defined FIX_BUG_50257 macro. r?xidorn draft
authorCameron McCormack <cam@mcc.id.au>
Tue, 05 Jun 2018 15:30:46 +1000
changeset 808586 3f5b942a9fe4a7f7c2b45ade51ddfb693d50d86b
parent 808580 e429320fcdd2d5236bb4713e6c435456146e42b9
child 808587 8e42edb81336fcc17861b8cc228ba7ab788dd92a
push id113428
push userbmo:cam@mcc.id.au
push dateWed, 20 Jun 2018 01:08:20 +0000
reviewersxidorn
bugs1469738
milestone62.0a1
Bug 1469738 - Part 1: Remove always-defined FIX_BUG_50257 macro. r?xidorn MozReview-Commit-ID: Ky7hxjRaKKk
layout/generic/nsLineLayout.cpp
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -40,18 +40,16 @@
 #undef  NOISY_TRIM
 #undef  REALLY_NOISY_TRIM
 #endif
 
 using namespace mozilla;
 
 //----------------------------------------------------------------------
 
-#define FIX_BUG_50257
-
 nsLineLayout::nsLineLayout(nsPresContext* aPresContext,
                            nsFloatManager* aFloatManager,
                            const ReflowInput* aOuterReflowInput,
                            const nsLineList::iterator* aLine,
                            nsLineLayout* aBaseLineLayout)
   : mPresContext(aPresContext),
     mFloatManager(aFloatManager),
     mBlockReflowInput(aOuterReflowInput),
@@ -1331,25 +1329,23 @@ nsLineLayout::CanPlaceFrame(PerFrameData
   if (0 == startMargin + pfd->mBounds.ISize(lineWM) + endMargin) {
     // Empty frames always fit right where they are
 #ifdef NOISY_CAN_PLACE_FRAME
     printf("   ==> empty frame fits\n");
 #endif
     return true;
   }
 
-#ifdef FIX_BUG_50257
   // another special case:  always place a BR
   if (pfd->mFrame->IsBrFrame()) {
 #ifdef NOISY_CAN_PLACE_FRAME
     printf("   ==> BR frame fits\n");
 #endif
     return true;
   }
-#endif
 
   if (aNotSafeToBreak) {
     // There are no frames on the line that take up width and the line is
     // not impacted by floats, so we must allow the current frame to be
     // placed on the line
 #ifdef NOISY_CAN_PLACE_FRAME
     printf("   ==> not-safe and not-impacted fits: ");
     while (nullptr != psd) {