No longer need to pass root to ExecuteInitialLayoutPass.

6 years ago · d3c3741bec
18 changed files with 65 additions and 65 deletions
--- a/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
+++ b/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
@ -28,7 +28,7 @@ namespace Avalonia.Controls.Embedding
        {
            EnsureInitialized();
            ApplyTemplate();
-            LayoutManager.ExecuteInitialLayoutPass(this);
+            LayoutManager.ExecuteInitialLayoutPass();
        }

        private void EnsureInitialized()
--- a/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevel.cs
+++ b/src/Avalonia.Controls/Embedding/Offscreen/OffscreenTopLevel.cs
@ -18,7 +18,7 @@ namespace Avalonia.Controls.Embedding.Offscreen
        {
            EnsureInitialized();
            ApplyTemplate();
-            LayoutManager.ExecuteInitialLayoutPass(this);
+            LayoutManager.ExecuteInitialLayoutPass();
        }

        private void EnsureInitialized()
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@ -519,7 +519,7 @@ namespace Avalonia.Controls
                }
            }

-            LayoutManager.ExecuteInitialLayoutPass(this);
+            LayoutManager.ExecuteInitialLayoutPass();

            using (BeginAutoSizing())
            {
@ -592,7 +592,7 @@ namespace Avalonia.Controls
                }
            }

-            LayoutManager.ExecuteInitialLayoutPass(this);
+            LayoutManager.ExecuteInitialLayoutPass();

            var result = new TaskCompletionSource<TResult>();

--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@ -162,7 +162,7 @@ namespace Avalonia.Controls

                if (!_hasExecutedInitialLayoutPass)
                {
-                    LayoutManager.ExecuteInitialLayoutPass(this);
+                    LayoutManager.ExecuteInitialLayoutPass();
                    _hasExecutedInitialLayoutPass = true;
                }
                PlatformImpl?.Show();
--- a/tests/Avalonia.Benchmarks/Layout/ControlsBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Layout/ControlsBenchmark.cs
@ -24,7 +24,7 @@ namespace Avalonia.Benchmarks.Layout
                Renderer = new NullRenderer()
            };

-            _root.LayoutManager.ExecuteInitialLayoutPass(_root);
+            _root.LayoutManager.ExecuteInitialLayoutPass();
        }

        [Benchmark]
--- a/tests/Avalonia.Benchmarks/Layout/Measure.cs
+++ b/tests/Avalonia.Benchmarks/Layout/Measure.cs
@ -25,7 +25,7 @@ namespace Avalonia.Benchmarks.Layout
            _controls.Add(panel);
            _controls = ControlHierarchyCreator.CreateChildren(_controls, panel, 3, 5, 5);

-            _root.LayoutManager.ExecuteInitialLayoutPass(_root);
+            _root.LayoutManager.ExecuteInitialLayoutPass();
        }

        [Benchmark, MethodImpl(MethodImplOptions.NoInlining)]
--- a/tests/Avalonia.Benchmarks/Traversal/VisualTreeTraversal.cs
+++ b/tests/Avalonia.Benchmarks/Traversal/VisualTreeTraversal.cs
@ -26,7 +26,7 @@ namespace Avalonia.Benchmarks.Traversal

            _shuffledControls = _controls.OrderBy(r => random.Next()).ToList();

-            _root.LayoutManager.ExecuteInitialLayoutPass(_root);
+            _root.LayoutManager.ExecuteInitialLayoutPass();
        }

        [Benchmark]
--- a/tests/Avalonia.Controls.UnitTests/GridTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/GridTests.cs
@ -1194,7 +1194,7 @@ namespace Avalonia.Controls.UnitTests
                Height = 50,
            };

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();

            PrintColumnDefinitions(grids[0]);
            Assert.Equal(5, grids[0].ColumnDefinitions[0].ActualWidth);
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
@ -329,7 +329,7 @@ namespace Avalonia.Controls.UnitTests
                    return tb;
                }, true);

-                lm.ExecuteInitialLayoutPass(wnd);
+                lm.ExecuteInitialLayoutPass();

                target.Items = items;

--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization.cs
@ -232,7 +232,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                var scroll = (TestScroller)target.Parent;

                scroll.Width = scroll.Height = 100;
-                scroll.LayoutManager.ExecuteInitialLayoutPass(scroll);
+                scroll.LayoutManager.ExecuteInitialLayoutPass();

                // Ensure than an intermediate measure pass doesn't add more controls than it
                // should. This can happen if target gets measured with Size.Infinity which
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs
@ -723,7 +723,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
            var scroller = (TestScroller)target.Parent;

            scroller.Width = scroller.Height = 100;
-            scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+            scroller.LayoutManager.ExecuteInitialLayoutPass();

            var last = (target.Items as IList)[10];

@ -740,7 +740,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
            var scroller = (TestScroller)target.Parent;

            scroller.Width = scroller.Height = 100;
-            scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+            scroller.LayoutManager.ExecuteInitialLayoutPass();

            var last = (target.Items as IList)[10];

@ -838,7 +838,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                var scroller = (TestScroller)target.Parent;

                scroller.Width = scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();

                var from = target.Panel.Children[5];
                var result = ((ILogicalScrollable)target).GetControlInDirection(
@ -855,7 +855,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                var scroller = (TestScroller)target.Parent;

                scroller.Width = scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();

                var from = target.Panel.Children[9];
                var result = ((ILogicalScrollable)target).GetControlInDirection(
@ -874,7 +874,7 @@ namespace Avalonia.Controls.UnitTests.Presenters

                scroller.Width = 100;
                scroller.Height = 95;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();

                var from = target.Panel.Children[8];
                var result = ((ILogicalScrollable)target).GetControlInDirection(
@ -893,7 +893,7 @@ namespace Avalonia.Controls.UnitTests.Presenters

                scroller.Width = 100;
                scroller.Height = 95;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();
                ((ILogicalScrollable)target).Offset = new Vector(0, 11);

                var from = target.Panel.Children[1];
@ -946,7 +946,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                var scroller = (TestScroller)target.Parent;

                scroller.Width = scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();

                var from = target.Panel.Children[5];
                var result = ((ILogicalScrollable)target).GetControlInDirection(
@ -963,7 +963,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                var scroller = (TestScroller)target.Parent;

                scroller.Width = scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();

                var from = target.Panel.Children[9];
                var result = ((ILogicalScrollable)target).GetControlInDirection(
@ -982,7 +982,7 @@ namespace Avalonia.Controls.UnitTests.Presenters

                scroller.Width = 95;
                scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();

                var from = target.Panel.Children[8];
                var result = ((ILogicalScrollable)target).GetControlInDirection(
@ -1001,7 +1001,7 @@ namespace Avalonia.Controls.UnitTests.Presenters

                scroller.Width = 95;
                scroller.Height = 100;
-                scroller.LayoutManager.ExecuteInitialLayoutPass(scroller);
+                scroller.LayoutManager.ExecuteInitialLayoutPass();
                ((ILogicalScrollable)target).Offset = new Vector(11, 0);

                var from = target.Panel.Children[1];
--- a/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs
@ -158,7 +158,7 @@ namespace Avalonia.Controls.UnitTests
            target.SetValue(ScrollViewer.ViewportProperty, new Size(50, 50));
            target.Offset = new Vector(10, 10);

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();

            target.ScrollChanged += (s, e) =>
            {
@ -188,7 +188,7 @@ namespace Avalonia.Controls.UnitTests
            target.SetValue(ScrollViewer.ViewportProperty, new Size(50, 50));
            target.Offset = new Vector(10, 10);

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();

            target.ScrollChanged += (s, e) =>
            {
@ -218,7 +218,7 @@ namespace Avalonia.Controls.UnitTests
            target.SetValue(ScrollViewer.ViewportProperty, new Size(50, 50));
            target.Offset = new Vector(10, 10);

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();

            target.ScrollChanged += (s, e) =>
            {
--- a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
@ -106,7 +106,7 @@ namespace Avalonia.Controls.UnitTests
                    }
                };

-                target.LayoutManager.ExecuteInitialLayoutPass(target);
+                target.LayoutManager.ExecuteInitialLayoutPass();

                Assert.Equal(new Rect(0, 0, 321, 432), target.Bounds);
            }
@ -282,7 +282,7 @@ namespace Avalonia.Controls.UnitTests
                    Content = child,
                };

-                target.LayoutManager.ExecuteInitialLayoutPass(target);
+                target.LayoutManager.ExecuteInitialLayoutPass();

                Assert.Equal(new Thickness(0), child.BorderThickness);

@ -295,7 +295,7 @@ namespace Avalonia.Controls.UnitTests
                };

                Application.Current.Styles.Add(style);
-                target.LayoutManager.ExecuteInitialLayoutPass(target);
+                target.LayoutManager.ExecuteInitialLayoutPass();

                Assert.Equal(new Thickness(2), child.BorderThickness);

--- a/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs
@ -13,7 +13,7 @@ namespace Avalonia.Layout.UnitTests
            var control = new LayoutTestControl();
            var root = new LayoutTestRoot { Child = control };

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
            control.Measured = control.Arranged = false;

            control.InvalidateMeasure();
@ -29,7 +29,7 @@ namespace Avalonia.Layout.UnitTests
            var control = new LayoutTestControl();
            var root = new LayoutTestRoot { Child = control };

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
            control.Measured = control.Arranged = false;

            control.InvalidateArrange();
@ -45,7 +45,7 @@ namespace Avalonia.Layout.UnitTests
            var control = new LayoutTestControl();
            var root = new LayoutTestRoot();

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
            root.Child = control;
            root.Measured = root.Arranged = false;

@ -80,7 +80,7 @@ namespace Avalonia.Layout.UnitTests
            root.DoMeasureOverride = MeasureOverride;
            control1.DoMeasureOverride = MeasureOverride;
            control2.DoMeasureOverride = MeasureOverride;
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();

            control2.InvalidateMeasure();
            control1.InvalidateMeasure();
@ -115,7 +115,7 @@ namespace Avalonia.Layout.UnitTests
            root.DoMeasureOverride = MeasureOverride;
            control1.DoMeasureOverride = MeasureOverride;
            control2.DoMeasureOverride = MeasureOverride;
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();

            control2.InvalidateMeasure();
            root.InvalidateMeasure();
@ -132,7 +132,7 @@ namespace Avalonia.Layout.UnitTests
            var control = new LayoutTestControl();
            var root = new LayoutTestRoot { Child = control };

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
            root.Measured = root.Arranged = false;
            control.Measured = control.Arranged = false;

@ -151,7 +151,7 @@ namespace Avalonia.Layout.UnitTests
            var control = new LayoutTestControl();
            var root = new LayoutTestRoot { Child = control };

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
            control.Measured = control.Arranged = false;

            control.InvalidateMeasure();
@ -177,7 +177,7 @@ namespace Avalonia.Layout.UnitTests
                return new Size(100, 100);
            };

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();

            Assert.Equal(Size.Infinity, availableSize);
        }
@ -199,7 +199,7 @@ namespace Avalonia.Layout.UnitTests
                return s;
            };

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
            Assert.Equal(new Size(100, 100), arrangeSize);

            root.Width = 120;
@ -225,7 +225,7 @@ namespace Avalonia.Layout.UnitTests
                }
            };

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
            Assert.Equal(new Size(0, 0), root.DesiredSize);

            border.Width = 100;
@ -241,7 +241,7 @@ namespace Avalonia.Layout.UnitTests
            var control = new LayoutTestControl();
            var root = new LayoutTestRoot { Child = control };

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
            control.Measured = false;

            int cnt = 0;
@ -272,7 +272,7 @@ namespace Avalonia.Layout.UnitTests
            var control = new LayoutTestControl();
            var root = new LayoutTestRoot { Child = control };

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
            control.Arranged = false;

            int cnt = 0;
@ -313,7 +313,7 @@ namespace Avalonia.Layout.UnitTests
            panel.Children.AddRange(nonArrageableTargets);
            panel.Children.AddRange(targets);

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();

            foreach (var c in panel.Children.OfType<LayoutTestControl>())
            {
@ -347,7 +347,7 @@ namespace Avalonia.Layout.UnitTests
            var control = new LayoutTestControl();
            var root = new LayoutTestRoot { Child = control };

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
            control.Measured = false;

            control.DoMeasureOverride = (l, s) =>
@ -380,7 +380,7 @@ namespace Avalonia.Layout.UnitTests
            var root = new LayoutTestRoot { Child = control };
            var count = 0;

-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();
            control.Measured = false;

            control.DoMeasureOverride = (l, s) =>
@ -399,7 +399,7 @@ namespace Avalonia.Layout.UnitTests

            root.InvalidateMeasure();
            control.InvalidateMeasure();
-            root.LayoutManager.ExecuteInitialLayoutPass(root);
+            root.LayoutManager.ExecuteInitialLayoutPass();

            Assert.Equal(new Size(200, 200), control.Bounds.Size);
            Assert.Equal(new Size(200, 200), control.DesiredSize);
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@ -44,7 +44,7 @@ namespace Avalonia.LeakTests
                    window.Show();

                    // Do a layout and make sure that Canvas gets added to visual tree.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                    Assert.IsType<Canvas>(window.Presenter.Child);

                    // Clear the content and ensure the Canvas is removed.
@ -82,7 +82,7 @@ namespace Avalonia.LeakTests
                    window.Show();

                    // Do a layout and make sure that Canvas gets added to visual tree.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                    Assert.IsType<Canvas>(window.Find<Canvas>("foo"));
                    Assert.IsType<Canvas>(window.Presenter.Child);

@ -122,7 +122,7 @@ namespace Avalonia.LeakTests

                    // Do a layout and make sure that ScrollViewer gets added to visual tree and its 
                    // template applied.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                    Assert.IsType<ScrollViewer>(window.Presenter.Child);
                    Assert.IsType<Canvas>(((ScrollViewer)window.Presenter.Child).Presenter.Child);

@ -159,7 +159,7 @@ namespace Avalonia.LeakTests

                    // Do a layout and make sure that TextBox gets added to visual tree and its 
                    // template applied.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                    Assert.IsType<TextBox>(window.Presenter.Child);
                    Assert.NotEmpty(window.Presenter.Child.GetVisualChildren());

@ -203,7 +203,7 @@ namespace Avalonia.LeakTests

                    // Do a layout and make sure that TextBox gets added to visual tree and its 
                    // Text property set.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                    Assert.IsType<TextBox>(window.Presenter.Child);
                    Assert.Equal("foo", ((TextBox)window.Presenter.Child).Text);

@ -241,7 +241,7 @@ namespace Avalonia.LeakTests

                // Do a layout and make sure that TextBox gets added to visual tree and its 
                // template applied.
-                window.LayoutManager.ExecuteInitialLayoutPass(window);
+                window.LayoutManager.ExecuteInitialLayoutPass();
                Assert.Same(textBox, window.Presenter.Child);

                // Get the border from the TextBox template.
@ -295,7 +295,7 @@ namespace Avalonia.LeakTests
                    window.Show();

                    // Do a layout and make sure that TreeViewItems get realized.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                    Assert.Single(target.ItemContainerGenerator.Containers);

                    // Clear the content and ensure the TreeView is removed.
@ -329,7 +329,7 @@ namespace Avalonia.LeakTests
                    window.Show();

                    // Do a layout and make sure that Slider gets added to visual tree.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                    Assert.IsType<Slider>(window.Presenter.Child);

                    // Clear the content and ensure the Slider is removed.
@ -403,7 +403,7 @@ namespace Avalonia.LeakTests

                    // Do a layout and make sure that Canvas gets added to visual tree with
                    // its render transform.
-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                    var canvas = Assert.IsType<Canvas>(window.Presenter.Child);
                    Assert.IsType<RotateTransform>(canvas.RenderTransform);

@ -512,7 +512,7 @@ namespace Avalonia.LeakTests

                    window.Show();

-                    window.LayoutManager.ExecuteInitialLayoutPass(window);
+                    window.LayoutManager.ExecuteInitialLayoutPass();
                    Assert.IsType<Path>(window.Presenter.Child);

                    window.Content = null;
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests.cs
@ -134,7 +134,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                var root = new TestRoot(child);
                root.Renderer = new ImmediateRenderer(root);

-                root.LayoutManager.ExecuteInitialLayoutPass(root);
+                root.LayoutManager.ExecuteInitialLayoutPass();

                root.Measure(new Size(50, 100));
                root.Arrange(new Rect(new Size(50, 100)));
@ -171,7 +171,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                var root = new TestRoot(child);
                root.Renderer = new ImmediateRenderer(root);

-                root.LayoutManager.ExecuteInitialLayoutPass(root);
+                root.LayoutManager.ExecuteInitialLayoutPass();

                root.Measure(new Size(300, 100));
                root.Arrange(new Rect(new Size(300, 100)));
@ -222,7 +222,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering

                var root = new TestRoot(rootGrid);
                root.Renderer = new ImmediateRenderer(root);
-                root.LayoutManager.ExecuteInitialLayoutPass(root);
+                root.LayoutManager.ExecuteInitialLayoutPass();

                var rootSize = new Size(RootWidth, RootHeight);
                root.Measure(rootSize);
@ -277,7 +277,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering

                var root = new TestRoot(rootGrid);
                root.Renderer = new ImmediateRenderer(root);
-                root.LayoutManager.ExecuteInitialLayoutPass(root);
+                root.LayoutManager.ExecuteInitialLayoutPass();

                var rootSize = new Size(RootWidth, RootHeight);
                root.Measure(rootSize);
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@ -653,7 +653,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                };

                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();

                var scene = new Scene(tree);
                var sceneBuilder = new SceneBuilder();
@ -696,7 +696,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                };

                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();

                var scene = new Scene(tree);
                var sceneBuilder = new SceneBuilder();
@ -744,7 +744,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                };

                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();

                var scene = new Scene(tree);
                var sceneBuilder = new SceneBuilder();
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests_Layers.cs
@ -40,7 +40,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                };

                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();

                var animation = new BehaviorSubject<double>(0.5);
                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
@ -105,7 +105,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                };

                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();

                var animation = new BehaviorSubject<double>(0.5);
                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
@ -147,7 +147,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                };

                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();

                var animation = new BehaviorSubject<double>(0.5);
                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
@ -197,7 +197,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                };

                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();

                var animation = new BehaviorSubject<double>(0.5);
                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);
@ -241,7 +241,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                };

                var layout = tree.LayoutManager;
-                layout.ExecuteInitialLayoutPass(tree);
+                layout.ExecuteInitialLayoutPass();

                var animation = new BehaviorSubject<double>(0.5);
                border.Bind(Border.OpacityProperty, animation, BindingPriority.Animation);