Merge pull request #3296 from MarchingCube/alloc-children-changed

grokys · web-flow · commit b99131af7379 · 2019-11-29T18:48:17.000+01:00
Cache delegates used for reacting to logical and visual children changes
diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs
@@ -288,7 +288,7 @@ protected IAvaloniaList<ILogical> LogicalChildren
                     var list = new AvaloniaList<ILogical>
                     {
                         ResetBehavior = ResetBehavior.Remove,
-                        Validate = ValidateLogicalChild
+                        Validate = logical => ValidateLogicalChild(logical)
                     };
                     list.CollectionChanged += LogicalChildrenCollectionChanged;
                     _logicalChildren = list;
diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs
@@ -121,7 +121,7 @@ public Visual()
         {
             var visualChildren = new AvaloniaList<IVisual>();
             visualChildren.ResetBehavior = ResetBehavior.Remove;
-            visualChildren.Validate = ValidateVisualChild;
+            visualChildren.Validate = visual => ValidateVisualChild(visual);
             visualChildren.CollectionChanged += VisualChildrenChanged;
             VisualChildren = visualChildren;
         }

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ protected IAvaloniaList<ILogical> LogicalChildren`
`288`	`288`	`var list = new AvaloniaList<ILogical>`
`289`	`289`	`{`
`290`	`290`	`ResetBehavior = ResetBehavior.Remove,`
`291`		`- Validate = ValidateLogicalChild`
	`291`	`+ Validate = logical => ValidateLogicalChild(logical)`
`292`	`292`	`};`
`293`	`293`	`list.CollectionChanged += LogicalChildrenCollectionChanged;`
`294`	`294`	`_logicalChildren = list;`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public Visual()`
`121`	`121`	`{`
`122`	`122`	`var visualChildren = new AvaloniaList<IVisual>();`
`123`	`123`	`visualChildren.ResetBehavior = ResetBehavior.Remove;`
`124`		`- visualChildren.Validate = ValidateVisualChild;`
	`124`	`+ visualChildren.Validate = visual => ValidateVisualChild(visual);`
`125`	`125`	`visualChildren.CollectionChanged += VisualChildrenChanged;`
`126`	`126`	`VisualChildren = visualChildren;`
`127`	`127`	`}`