From 18ec5281307cf04ce084e27252360aec025085be Mon Sep 17 00:00:00 2001
From: "kipp%netscape.com"
 <kipp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 20 Nov 1998 17:41:44 +0000
Subject: [PATCH] Added support for StyleChanged reflow reason

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

diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index 62e3e55e686..dc20533964b 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
       rv = ChildIncrementalReflow(state);
     }
   }
-  else if (eReflowReason_Resize == state.reason) {
+  else if ((eReflowReason_Resize == state.reason) ||
+           (eReflowReason_StyleChange == state.reason)) {
     DrainOverflowLines();
     rv = ResizeReflow(state);
   }
diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp
index 62e3e55e686..dc20533964b 100644
--- a/mozilla/layout/generic/nsBlockReflowState.cpp
+++ b/mozilla/layout/generic/nsBlockReflowState.cpp
@@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
       rv = ChildIncrementalReflow(state);
     }
   }
-  else if (eReflowReason_Resize == state.reason) {
+  else if ((eReflowReason_Resize == state.reason) ||
+           (eReflowReason_StyleChange == state.reason)) {
     DrainOverflowLines();
     rv = ResizeReflow(state);
   }
diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h
index 62e3e55e686..dc20533964b 100644
--- a/mozilla/layout/generic/nsBlockReflowState.h
+++ b/mozilla/layout/generic/nsBlockReflowState.h
@@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
       rv = ChildIncrementalReflow(state);
     }
   }
-  else if (eReflowReason_Resize == state.reason) {
+  else if ((eReflowReason_Resize == state.reason) ||
+           (eReflowReason_StyleChange == state.reason)) {
     DrainOverflowLines();
     rv = ResizeReflow(state);
   }
diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp
index 6a9009e1a8c..f51fc22b9db 100644
--- a/mozilla/layout/generic/nsInlineFrame.cpp
+++ b/mozilla/layout/generic/nsInlineFrame.cpp
@@ -610,7 +610,8 @@ nsInlineFrame::Reflow(nsIPresContext& aPresContext,
       aStatus = ChildIncrementalReflow(state, inlineReflow);
     }
   }
-  else if (eReflowReason_Resize == state.reason) {
+  else if ((eReflowReason_Resize == state.reason) ||
+           (eReflowReason_StyleChange == state.reason)) {
     DrainOverflowLists(aPresContext);
     aStatus = ResizeReflow(state, inlineReflow);
   }
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index 62e3e55e686..dc20533964b 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
       rv = ChildIncrementalReflow(state);
     }
   }
-  else if (eReflowReason_Resize == state.reason) {
+  else if ((eReflowReason_Resize == state.reason) ||
+           (eReflowReason_StyleChange == state.reason)) {
     DrainOverflowLines();
     rv = ResizeReflow(state);
   }
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
index 62e3e55e686..dc20533964b 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
@@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
       rv = ChildIncrementalReflow(state);
     }
   }
-  else if (eReflowReason_Resize == state.reason) {
+  else if ((eReflowReason_Resize == state.reason) ||
+           (eReflowReason_StyleChange == state.reason)) {
     DrainOverflowLines();
     rv = ResizeReflow(state);
   }
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h
index 62e3e55e686..dc20533964b 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.h
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.h
@@ -1756,7 +1756,8 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
       rv = ChildIncrementalReflow(state);
     }
   }
-  else if (eReflowReason_Resize == state.reason) {
+  else if ((eReflowReason_Resize == state.reason) ||
+           (eReflowReason_StyleChange == state.reason)) {
     DrainOverflowLines();
     rv = ResizeReflow(state);
   }
diff --git a/mozilla/layout/html/base/src/nsInlineFrame.cpp b/mozilla/layout/html/base/src/nsInlineFrame.cpp
index 6a9009e1a8c..f51fc22b9db 100644
--- a/mozilla/layout/html/base/src/nsInlineFrame.cpp
+++ b/mozilla/layout/html/base/src/nsInlineFrame.cpp
@@ -610,7 +610,8 @@ nsInlineFrame::Reflow(nsIPresContext& aPresContext,
       aStatus = ChildIncrementalReflow(state, inlineReflow);
     }
   }
-  else if (eReflowReason_Resize == state.reason) {
+  else if ((eReflowReason_Resize == state.reason) ||
+           (eReflowReason_StyleChange == state.reason)) {
     DrainOverflowLists(aPresContext);
     aStatus = ResizeReflow(state, inlineReflow);
   }