From 536a2f7c6220d549b4dbfdf20ec792080a39e541 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 23 Jun 2020 16:46:14 +0200
Subject: [PATCH] Check correct root in invalidation calls.

---
 src/Avalonia.Layout/LayoutManager.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Avalonia.Layout/LayoutManager.cs b/src/Avalonia.Layout/LayoutManager.cs
index a81f2b61b7..8f964a6041 100644
--- a/src/Avalonia.Layout/LayoutManager.cs
+++ b/src/Avalonia.Layout/LayoutManager.cs
@@ -43,6 +43,11 @@ namespace Avalonia.Layout
 #endif
             }
 
+            if (control.VisualRoot != _owner)
+            {
+                throw new ArgumentException("Attempt to call InvalidateMeasure on wrong LayoutManager.");
+            }
+
             _toMeasure.Enqueue(control);
             _toArrange.Enqueue(control);
             QueueLayoutPass();
@@ -64,6 +69,11 @@ namespace Avalonia.Layout
 #endif
             }
 
+            if (control.VisualRoot != _owner)
+            {
+                throw new ArgumentException("Attempt to call InvalidateArrange on wrong LayoutManager.");
+            }
+
             _toArrange.Enqueue(control);
             QueueLayoutPass();
         }