Bug 209694. Major rework of margin-collapsing and clearance to match CSS 2.1 rules. Also includes major incremental reflow fixes for those situations. See the bug for details. rubber-stamp r+sr=dbaron

git-svn-id: svn://10.0.0.236/trunk@165781 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/layout/generic/nsLineBox.cpp

@@ -181,13 +181,14 @@ BreakTypeToString(PRUint8 aBreakType)
 char*
 nsLineBox::StateToString(char* aBuf, PRInt32 aBufSize) const
 {
-  PR_snprintf(aBuf, aBufSize, "%s,%s,%s,%s,%s,%s[0x%x]",
+  PR_snprintf(aBuf, aBufSize, "%s,%s,%s,%s,%s,before:%s,after:%s[0x%x]",
               IsBlock() ? "block" : "inline",
               IsDirty() ? "dirty" : "clean",
               IsPreviousMarginDirty() ? "prevmargindirty" : "prevmarginclean",
               IsImpactedByFloat() ? "impacted" : "not impacted",
               IsLineWrapped() ? "wrapped" : "not wrapped",
-              BreakTypeToString(GetBreakType()),
+              BreakTypeToString(GetBreakTypeBefore()),
+              BreakTypeToString(GetBreakTypeAfter()),
               mAllFlags);
   return aBuf;
 }
@@ -604,7 +605,7 @@ nsLineIterator::GetLine(PRInt32 aLineNumber,
     flags |= NS_LINE_FLAG_IS_BLOCK;
   }
   else {
-    if (line->HasBreak())
+    if (line->HasBreakAfter())
       flags |= NS_LINE_FLAG_ENDS_IN_BREAK;
   }
   *aLineFlags = flags;