Bugfix in CssLayoutEngine.ApplyCenterAlignment and CssLayoutEngine.ApplyRightAlignment where in certain situations an exception was thrown instead of applying the alignment due to reversed lookup.

configurator · configurator · commit c03e1cad0782 · 2014-10-17T03:35:55.000+03:00
diff --git a/Source/HtmlRenderer/Core/Dom/CssLayoutEngine.cs b/Source/HtmlRenderer/Core/Dom/CssLayoutEngine.cs
@@ -624,10 +624,10 @@ private static void ApplyCenterAlignment(RGraphics g, CssLineBox line)
                     word.Left += diff;
                 }
 
-                foreach (CssBox b in line.Rectangles.Keys)
+                foreach (CssBox b in ToList(line.Rectangles.Keys))
                 {
-                    RRect r = b.Rectangles[line];
-                    b.Rectangles[line] = new RRect(r.X + diff, r.Y, r.Width, r.Height);
+                    RRect r = line.Rectangles[b];
+                    line.Rectangles[b] = new RRect(r.X + diff, r.Y, r.Width, r.Height);
                 }
             }
         }
@@ -654,10 +654,10 @@ private static void ApplyRightAlignment(RGraphics g, CssLineBox line)
                     word.Left += diff;
                 }
 
-                foreach (CssBox b in line.Rectangles.Keys)
+                foreach (CssBox b in ToList(line.Rectangles.Keys))
                 {
-                    RRect r = b.Rectangles[line];
-                    b.Rectangles[line] = new RRect(r.X + diff, r.Y, r.Width, r.Height);
+                    RRect r = line.Rectangles[b];
+                    line.Rectangles[b] = new RRect(r.X + diff, r.Y, r.Width, r.Height);
                 }
             }
         }
@@ -687,6 +687,16 @@ private static void ApplyLeftAlignment(RGraphics g, CssLineBox line)
             //}
         }
 
+        private static List<T> ToList<T>(IEnumerable<T> collection)
+        {
+            List<T> result = new List<T>();
+            foreach (T item in collection)
+            {
+                result.Add(item);
+            }
+            return result;
+        }
+
         #endregion
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -624,10 +624,10 @@ private static void ApplyCenterAlignment(RGraphics g, CssLineBox line)`
`624`	`624`	`word.Left += diff;`
`625`	`625`	`}`
`626`	`626`
`627`		`- foreach (CssBox b in line.Rectangles.Keys)`
	`627`	`+ foreach (CssBox b in ToList(line.Rectangles.Keys))`
`628`	`628`	`{`
`629`		`- RRect r = b.Rectangles[line];`
`630`		`- b.Rectangles[line] = new RRect(r.X + diff, r.Y, r.Width, r.Height);`
	`629`	`+ RRect r = line.Rectangles[b];`
	`630`	`+ line.Rectangles[b] = new RRect(r.X + diff, r.Y, r.Width, r.Height);`
`631`	`631`	`}`
`632`	`632`	`}`
`633`	`633`	`}`
`@@ -654,10 +654,10 @@ private static void ApplyRightAlignment(RGraphics g, CssLineBox line)`
`654`	`654`	`word.Left += diff;`
`655`	`655`	`}`
`656`	`656`
`657`		`- foreach (CssBox b in line.Rectangles.Keys)`
	`657`	`+ foreach (CssBox b in ToList(line.Rectangles.Keys))`
`658`	`658`	`{`
`659`		`- RRect r = b.Rectangles[line];`
`660`		`- b.Rectangles[line] = new RRect(r.X + diff, r.Y, r.Width, r.Height);`
	`659`	`+ RRect r = line.Rectangles[b];`
	`660`	`+ line.Rectangles[b] = new RRect(r.X + diff, r.Y, r.Width, r.Height);`
`661`	`661`	`}`
`662`	`662`	`}`
`663`	`663`	`}`
`@@ -687,6 +687,16 @@ private static void ApplyLeftAlignment(RGraphics g, CssLineBox line)`
`687`	`687`	`//}`
`688`	`688`	`}`
`689`	`689`
	`690`	`+ private static List<T> ToList<T>(IEnumerable<T> collection)`
	`691`	`+ {`
	`692`	`+ List<T> result = new List<T>();`
	`693`	`+ foreach (T item in collection)`
	`694`	`+ {`
	`695`	`+ result.Add(item);`
	`696`	`+ }`
	`697`	`+ return result;`
	`698`	`+ }`
	`699`	`+`
`690`	`700`	`#endregion`
`691`	`701`	`}`
`692`	`702`	`}`