* fix collection use CorrectBlockInsideInline

ArthurHub · ArthurHub · commit 93acf5ffcb82 · 2014-04-14T14:42:59.000+03:00
diff --git a/Source/HtmlRenderer/Dom/CssBox.cs b/Source/HtmlRenderer/Dom/CssBox.cs
@@ -470,6 +470,19 @@ public void SetBeforeBox(CssBox before)
             _parentBox.Boxes.Insert(index, this);
         }
 
+        /// <summary>
+        /// Move all child boxes from <paramref name="fromBox"/> to this box.
+        /// </summary>
+        /// <param name="fromBox">the box to move all its child boxes from</param>
+        public void SetAllBoxes(CssBox fromBox)
+        {
+            foreach(var childBox in fromBox._boxes)
+                childBox._parentBox = this;
+
+            _boxes.AddRange(fromBox._boxes);
+            fromBox._boxes.Clear();
+        }
+
         /// <summary>
         /// Splits the text into words and saves the result
         /// </summary>
diff --git a/Source/HtmlRenderer/Parse/DomParser.cs b/Source/HtmlRenderer/Parse/DomParser.cs
@@ -695,8 +695,7 @@ private static void CorrectBlockInsideInlineImp(CssBox box)
                     if( DomUtils.ContainsInlinesOnly(tempRightBox) && !ContainsInlinesOnlyDeep(tempRightBox) )
                         CorrectBlockInsideInlineImp(tempRightBox);
 
-                    while( tempRightBox.Boxes.Count > 0 )
-                        tempRightBox.Boxes[0].ParentBox = tempRightBox.ParentBox;
+                    tempRightBox.ParentBox.SetAllBoxes(tempRightBox);
                     tempRightBox.ParentBox = null;
                 }
 
@@ -763,8 +762,7 @@ private static void CorrectBlockSplitBadBox(CssBox parentBox, CssBox badBox, Css
                     rightBox = parentBox.Boxes[2];
                 }
 
-                while (badBox.Boxes.Count > 0)
-                    badBox.Boxes[0].ParentBox = rightBox;
+                rightBox.SetAllBoxes(badBox);
             }
             else if (splitBox.ParentBox != null && parentBox.Boxes.Count > 1)
             {

Original file line number	Diff line number	Diff line change
`@@ -695,8 +695,7 @@ private static void CorrectBlockInsideInlineImp(CssBox box)`
`695`	`695`	`if( DomUtils.ContainsInlinesOnly(tempRightBox) && !ContainsInlinesOnlyDeep(tempRightBox) )`
`696`	`696`	`CorrectBlockInsideInlineImp(tempRightBox);`
`697`	`697`
`698`		`- while( tempRightBox.Boxes.Count > 0 )`
`699`		`- tempRightBox.Boxes[0].ParentBox = tempRightBox.ParentBox;`
	`698`	`+ tempRightBox.ParentBox.SetAllBoxes(tempRightBox);`
`700`	`699`	`tempRightBox.ParentBox = null;`
`701`	`700`	`}`
`702`	`701`
`@@ -763,8 +762,7 @@ private static void CorrectBlockSplitBadBox(CssBox parentBox, CssBox badBox, Css`
`763`	`762`	`rightBox = parentBox.Boxes[2];`
`764`	`763`	`}`
`765`	`764`
`766`		`- while (badBox.Boxes.Count > 0)`
`767`		`- badBox.Boxes[0].ParentBox = rightBox;`
	`765`	`+ rightBox.SetAllBoxes(badBox);`
`768`	`766`	`}`
`769`	`767`	`else if (splitBox.ParentBox != null && parentBox.Boxes.Count > 1)`
`770`	`768`	`{`