From 787faefa9e78f8ed52acda4b75005638ad487b54 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Sun, 18 Jan 2004 18:20:57 +0000 Subject: [PATCH] Back out accidentally committed code. Bug 230852, r+sr=roc --- layout/generic/nsBlockFrame.cpp | 4 +--- layout/html/base/src/nsBlockFrame.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 9ac443a0269f..f5c57ed0ad12 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -3662,9 +3662,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState, // Break-after cases if (breakType == NS_STYLE_CLEAR_LINE) { if (!aLineLayout.GetLineEndsInBR()) { -#ifdef DEBUG_roc - // breakType = NS_STYLE_CLEAR_NONE; -#endif + breakType = NS_STYLE_CLEAR_NONE; } } aLine->SetBreakType(breakType); diff --git a/layout/html/base/src/nsBlockFrame.cpp b/layout/html/base/src/nsBlockFrame.cpp index 9ac443a0269f..f5c57ed0ad12 100644 --- a/layout/html/base/src/nsBlockFrame.cpp +++ b/layout/html/base/src/nsBlockFrame.cpp @@ -3662,9 +3662,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState, // Break-after cases if (breakType == NS_STYLE_CLEAR_LINE) { if (!aLineLayout.GetLineEndsInBR()) { -#ifdef DEBUG_roc - // breakType = NS_STYLE_CLEAR_NONE; -#endif + breakType = NS_STYLE_CLEAR_NONE; } } aLine->SetBreakType(breakType);