Support clear attribute on floaters; nicer ListTag method

layout/generic/nsBlockFrame.cpp

@@ -1542,7 +1542,9 @@ NS_IMETHODIMP
 nsBlockFrame::ListTag(FILE* out) const
 {
   if ((nsnull != mGeometricParent) && IsPseudoFrame()) {
-    fprintf(out, "*block<");
+    fprintf(out, "*");
+  }
+  fprintf(out, "Block<");
   nsIAtom* atom;
   mContent->GetTag(atom);
   if (nsnull != atom) {
@@ -1551,9 +1553,6 @@ nsBlockFrame::ListTag(FILE* out) const
     fputs(tmp, out);
   }
   fprintf(out, ">(%d)@%p", ContentIndexInContainer(this), this);
-  } else {
-    nsBlockFrameSuper::ListTag(out);
-  }
   return NS_OK;
 }
 
@@ -4118,9 +4117,6 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
     }
   }
 
-  // Get the band of available space
-  GetAvailableSpace();
-
   // Get the type of floater
   const nsStyleDisplay* floaterDisplay;
   const nsStyleSpacing* floaterSpacing;
@@ -4129,6 +4125,15 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
   floater->GetStyleData(eStyleStruct_Spacing,
                         (const nsStyleStruct*&)floaterSpacing);
 
+  // See if the floater should clear any preceeding floaters...
+  if (NS_STYLE_CLEAR_NONE != floaterDisplay->mBreakType) {
+    ClearFloaters(floaterDisplay->mBreakType);
+  }
+  else {
+    // Get the band of available space
+    GetAvailableSpace();
+  }
+
   // Get the floaters bounding box and margin information
   nsRect region;
   floater->GetRect(region);

layout/generic/nsBlockReflowState.cpp

@@ -1542,7 +1542,9 @@ NS_IMETHODIMP
 nsBlockFrame::ListTag(FILE* out) const
 {
   if ((nsnull != mGeometricParent) && IsPseudoFrame()) {
-    fprintf(out, "*block<");
+    fprintf(out, "*");
+  }
+  fprintf(out, "Block<");
   nsIAtom* atom;
   mContent->GetTag(atom);
   if (nsnull != atom) {
@@ -1551,9 +1553,6 @@ nsBlockFrame::ListTag(FILE* out) const
     fputs(tmp, out);
   }
   fprintf(out, ">(%d)@%p", ContentIndexInContainer(this), this);
-  } else {
-    nsBlockFrameSuper::ListTag(out);
-  }
   return NS_OK;
 }
 
@@ -4118,9 +4117,6 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
     }
   }
 
-  // Get the band of available space
-  GetAvailableSpace();
-
   // Get the type of floater
   const nsStyleDisplay* floaterDisplay;
   const nsStyleSpacing* floaterSpacing;
@@ -4129,6 +4125,15 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
   floater->GetStyleData(eStyleStruct_Spacing,
                         (const nsStyleStruct*&)floaterSpacing);
 
+  // See if the floater should clear any preceeding floaters...
+  if (NS_STYLE_CLEAR_NONE != floaterDisplay->mBreakType) {
+    ClearFloaters(floaterDisplay->mBreakType);
+  }
+  else {
+    // Get the band of available space
+    GetAvailableSpace();
+  }
+
   // Get the floaters bounding box and margin information
   nsRect region;
   floater->GetRect(region);

layout/generic/nsBlockReflowState.h

@@ -1542,7 +1542,9 @@ NS_IMETHODIMP
 nsBlockFrame::ListTag(FILE* out) const
 {
   if ((nsnull != mGeometricParent) && IsPseudoFrame()) {
-    fprintf(out, "*block<");
+    fprintf(out, "*");
+  }
+  fprintf(out, "Block<");
   nsIAtom* atom;
   mContent->GetTag(atom);
   if (nsnull != atom) {
@@ -1551,9 +1553,6 @@ nsBlockFrame::ListTag(FILE* out) const
     fputs(tmp, out);
   }
   fprintf(out, ">(%d)@%p", ContentIndexInContainer(this), this);
-  } else {
-    nsBlockFrameSuper::ListTag(out);
-  }
   return NS_OK;
 }
 
@@ -4118,9 +4117,6 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
     }
   }
 
-  // Get the band of available space
-  GetAvailableSpace();
-
   // Get the type of floater
   const nsStyleDisplay* floaterDisplay;
   const nsStyleSpacing* floaterSpacing;
@@ -4129,6 +4125,15 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
   floater->GetStyleData(eStyleStruct_Spacing,
                         (const nsStyleStruct*&)floaterSpacing);
 
+  // See if the floater should clear any preceeding floaters...
+  if (NS_STYLE_CLEAR_NONE != floaterDisplay->mBreakType) {
+    ClearFloaters(floaterDisplay->mBreakType);
+  }
+  else {
+    // Get the band of available space
+    GetAvailableSpace();
+  }
+
   // Get the floaters bounding box and margin information
   nsRect region;
   floater->GetRect(region);

layout/html/base/src/nsBlockFrame.cpp

@@ -1542,7 +1542,9 @@ NS_IMETHODIMP
 nsBlockFrame::ListTag(FILE* out) const
 {
   if ((nsnull != mGeometricParent) && IsPseudoFrame()) {
-    fprintf(out, "*block<");
+    fprintf(out, "*");
+  }
+  fprintf(out, "Block<");
   nsIAtom* atom;
   mContent->GetTag(atom);
   if (nsnull != atom) {
@@ -1551,9 +1553,6 @@ nsBlockFrame::ListTag(FILE* out) const
     fputs(tmp, out);
   }
   fprintf(out, ">(%d)@%p", ContentIndexInContainer(this), this);
-  } else {
-    nsBlockFrameSuper::ListTag(out);
-  }
   return NS_OK;
 }
 
@@ -4118,9 +4117,6 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
     }
   }
 
-  // Get the band of available space
-  GetAvailableSpace();
-
   // Get the type of floater
   const nsStyleDisplay* floaterDisplay;
   const nsStyleSpacing* floaterSpacing;
@@ -4129,6 +4125,15 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
   floater->GetStyleData(eStyleStruct_Spacing,
                         (const nsStyleStruct*&)floaterSpacing);
 
+  // See if the floater should clear any preceeding floaters...
+  if (NS_STYLE_CLEAR_NONE != floaterDisplay->mBreakType) {
+    ClearFloaters(floaterDisplay->mBreakType);
+  }
+  else {
+    // Get the band of available space
+    GetAvailableSpace();
+  }
+
   // Get the floaters bounding box and margin information
   nsRect region;
   floater->GetRect(region);

layout/html/base/src/nsBlockReflowState.cpp

@@ -1542,7 +1542,9 @@ NS_IMETHODIMP
 nsBlockFrame::ListTag(FILE* out) const
 {
   if ((nsnull != mGeometricParent) && IsPseudoFrame()) {
-    fprintf(out, "*block<");
+    fprintf(out, "*");
+  }
+  fprintf(out, "Block<");
   nsIAtom* atom;
   mContent->GetTag(atom);
   if (nsnull != atom) {
@@ -1551,9 +1553,6 @@ nsBlockFrame::ListTag(FILE* out) const
     fputs(tmp, out);
   }
   fprintf(out, ">(%d)@%p", ContentIndexInContainer(this), this);
-  } else {
-    nsBlockFrameSuper::ListTag(out);
-  }
   return NS_OK;
 }
 
@@ -4118,9 +4117,6 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
     }
   }
 
-  // Get the band of available space
-  GetAvailableSpace();
-
   // Get the type of floater
   const nsStyleDisplay* floaterDisplay;
   const nsStyleSpacing* floaterSpacing;
@@ -4129,6 +4125,15 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
   floater->GetStyleData(eStyleStruct_Spacing,
                         (const nsStyleStruct*&)floaterSpacing);
 
+  // See if the floater should clear any preceeding floaters...
+  if (NS_STYLE_CLEAR_NONE != floaterDisplay->mBreakType) {
+    ClearFloaters(floaterDisplay->mBreakType);
+  }
+  else {
+    // Get the band of available space
+    GetAvailableSpace();
+  }
+
   // Get the floaters bounding box and margin information
   nsRect region;
   floater->GetRect(region);

layout/html/base/src/nsBlockReflowState.h

@@ -1542,7 +1542,9 @@ NS_IMETHODIMP
 nsBlockFrame::ListTag(FILE* out) const
 {
   if ((nsnull != mGeometricParent) && IsPseudoFrame()) {
-    fprintf(out, "*block<");
+    fprintf(out, "*");
+  }
+  fprintf(out, "Block<");
   nsIAtom* atom;
   mContent->GetTag(atom);
   if (nsnull != atom) {
@@ -1551,9 +1553,6 @@ nsBlockFrame::ListTag(FILE* out) const
     fputs(tmp, out);
   }
   fprintf(out, ">(%d)@%p", ContentIndexInContainer(this), this);
-  } else {
-    nsBlockFrameSuper::ListTag(out);
-  }
   return NS_OK;
 }
 
@@ -4118,9 +4117,6 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
     }
   }
 
-  // Get the band of available space
-  GetAvailableSpace();
-
   // Get the type of floater
   const nsStyleDisplay* floaterDisplay;
   const nsStyleSpacing* floaterSpacing;
@@ -4129,6 +4125,15 @@ nsBlockReflowState::PlaceFloater(nsPlaceholderFrame* aPlaceholder,
   floater->GetStyleData(eStyleStruct_Spacing,
                         (const nsStyleStruct*&)floaterSpacing);
 
+  // See if the floater should clear any preceeding floaters...
+  if (NS_STYLE_CLEAR_NONE != floaterDisplay->mBreakType) {
+    ClearFloaters(floaterDisplay->mBreakType);
+  }
+  else {
+    // Get the band of available space
+    GetAvailableSpace();
+  }
+
   // Get the floaters bounding box and margin information
   nsRect region;
   floater->GetRect(region);