From 09d59fd2f9b3eacdcc035062516d096823c17e1c Mon Sep 17 00:00:00 2001
From: "buster%netscape.com"
 <buster%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 12 Oct 2000 20:30:43 +0000
Subject: [PATCH] backed out my/waterson's potential fix for bug 43914 this
 fixes bug 56102 a=waterson

git-svn-id: svn://10.0.0.236/trunk@81037 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsBlockFrame.cpp             | 4 ++--
 mozilla/layout/generic/nsBlockReflowState.cpp       | 4 ++--
 mozilla/layout/generic/nsBlockReflowState.h         | 4 ++--
 mozilla/layout/html/base/src/nsBlockFrame.cpp       | 4 ++--
 mozilla/layout/html/base/src/nsBlockReflowState.cpp | 4 ++--
 mozilla/layout/html/base/src/nsBlockReflowState.h   | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index b9754ccfea0..7b78ecd6b68 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -4454,14 +4454,14 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       if (NS_FAILED(rv)) {
         return rv;
       }
-#if 0
+
       // Mark next line dirty in case SplitLine didn't end up
       // pushing any frames.
       nsLineBox* next = aLine->mNext;
       if ((nsnull != next) && !next->IsBlock()) {
         next->MarkDirty();
       }
-#endif
+
     }
   }
   else if (NS_FRAME_IS_NOT_COMPLETE(frameReflowStatus)) {
diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp
index b9754ccfea0..7b78ecd6b68 100644
--- a/mozilla/layout/generic/nsBlockReflowState.cpp
+++ b/mozilla/layout/generic/nsBlockReflowState.cpp
@@ -4454,14 +4454,14 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       if (NS_FAILED(rv)) {
         return rv;
       }
-#if 0
+
       // Mark next line dirty in case SplitLine didn't end up
       // pushing any frames.
       nsLineBox* next = aLine->mNext;
       if ((nsnull != next) && !next->IsBlock()) {
         next->MarkDirty();
       }
-#endif
+
     }
   }
   else if (NS_FRAME_IS_NOT_COMPLETE(frameReflowStatus)) {
diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h
index b9754ccfea0..7b78ecd6b68 100644
--- a/mozilla/layout/generic/nsBlockReflowState.h
+++ b/mozilla/layout/generic/nsBlockReflowState.h
@@ -4454,14 +4454,14 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       if (NS_FAILED(rv)) {
         return rv;
       }
-#if 0
+
       // Mark next line dirty in case SplitLine didn't end up
       // pushing any frames.
       nsLineBox* next = aLine->mNext;
       if ((nsnull != next) && !next->IsBlock()) {
         next->MarkDirty();
       }
-#endif
+
     }
   }
   else if (NS_FRAME_IS_NOT_COMPLETE(frameReflowStatus)) {
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index b9754ccfea0..7b78ecd6b68 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -4454,14 +4454,14 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       if (NS_FAILED(rv)) {
         return rv;
       }
-#if 0
+
       // Mark next line dirty in case SplitLine didn't end up
       // pushing any frames.
       nsLineBox* next = aLine->mNext;
       if ((nsnull != next) && !next->IsBlock()) {
         next->MarkDirty();
       }
-#endif
+
     }
   }
   else if (NS_FRAME_IS_NOT_COMPLETE(frameReflowStatus)) {
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
index b9754ccfea0..7b78ecd6b68 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
@@ -4454,14 +4454,14 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       if (NS_FAILED(rv)) {
         return rv;
       }
-#if 0
+
       // Mark next line dirty in case SplitLine didn't end up
       // pushing any frames.
       nsLineBox* next = aLine->mNext;
       if ((nsnull != next) && !next->IsBlock()) {
         next->MarkDirty();
       }
-#endif
+
     }
   }
   else if (NS_FRAME_IS_NOT_COMPLETE(frameReflowStatus)) {
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h
index b9754ccfea0..7b78ecd6b68 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.h
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.h
@@ -4454,14 +4454,14 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       if (NS_FAILED(rv)) {
         return rv;
       }
-#if 0
+
       // Mark next line dirty in case SplitLine didn't end up
       // pushing any frames.
       nsLineBox* next = aLine->mNext;
       if ((nsnull != next) && !next->IsBlock()) {
         next->MarkDirty();
       }
-#endif
+
     }
   }
   else if (NS_FRAME_IS_NOT_COMPLETE(frameReflowStatus)) {