Prep VisualElement (and descendants) for removal of InternalsVisibleTo (#141)

6 files changed, 17 insertions, 11 deletions

diff --git a/Xamarin.Forms.Platform.WinRT/DatePickerRenderer.cs b/Xamarin.Forms.Platform.WinRT/DatePickerRenderer.cs
index 88df5cbc..646d7d33 100644
--- a/Xamarin.Forms.Platform.WinRT/DatePickerRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/DatePickerRenderer.cs
@@ -3,6 +3,7 @@ using System.ComponentModel;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
+using Xamarin.Forms.Internals;
 
 #if WINDOWS_UWP
 
@@ -85,12 +86,12 @@ namespace Xamarin.Forms.Platform.WinRT
 			if (currentDate != e.NewDate.Date) // Match coerced value
 				UpdateDate(currentDate);
 
-			Element.InvalidateMeasure(InvalidationTrigger.SizeRequestChanged);
+			((IVisualElementController)Element).InvalidateMeasure(InvalidationTrigger.SizeRequestChanged);
 		}
 
 		void PickerOnForceInvalidate(object sender, EventArgs eventArgs)
 		{
-			Element?.InvalidateMeasure(InvalidationTrigger.SizeRequestChanged);
+			((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.SizeRequestChanged);
 		}
 
 		void UpdateDate(DateTime date)
diff --git a/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs b/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs
index 29368aaf..3807570d 100644
--- a/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs
@@ -3,6 +3,7 @@ using System.ComponentModel;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Media.Imaging;
+using Xamarin.Forms.Internals;
 
 #if WINDOWS_UWP
 
@@ -90,7 +91,7 @@ namespace Xamarin.Forms.Platform.WinRT
 
 		void RefreshImage()
 		{
-			Element?.InvalidateMeasure(InvalidationTrigger.RendererReady);
+			((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.RendererReady);
 		}
 
 		void UpdateAspect()
diff --git a/Xamarin.Forms.Platform.WinRT/NativeViewWrapperRenderer.cs b/Xamarin.Forms.Platform.WinRT/NativeViewWrapperRenderer.cs
index 0e669774..b7e70d0f 100644
--- a/Xamarin.Forms.Platform.WinRT/NativeViewWrapperRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/NativeViewWrapperRenderer.cs
@@ -1,4 +1,5 @@
 using Windows.UI.Xaml;
+using Xamarin.Forms.Internals;
 
 #if WINDOWS_UWP
 
@@ -67,7 +68,7 @@ namespace Xamarin.Forms.Platform.WinRT
 			if (e.OldElement == null)
 			{
 				SetNativeControl(Element.NativeElement);
-				Control.LayoutUpdated += (sender, args) => { Element?.InvalidateMeasure(InvalidationTrigger.MeasureChanged); };
+				Control.LayoutUpdated += (sender, args) => { ((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.MeasureChanged); };
 			}
 		}
 	}
diff --git a/Xamarin.Forms.Platform.WinRT/PickerRenderer.cs b/Xamarin.Forms.Platform.WinRT/PickerRenderer.cs
index e37b79a1..7095333a 100644
--- a/Xamarin.Forms.Platform.WinRT/PickerRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/PickerRenderer.cs
@@ -5,6 +5,7 @@ using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
+using Xamarin.Forms.Internals;
 
 #if WINDOWS_UWP
 
@@ -97,7 +98,7 @@ namespace Xamarin.Forms.Platform.WinRT
 			if (!Control.IsFullScreen)
 			{
 				// Force a final redraw after the closing animation has completed
-				Element?.InvalidateMeasure(InvalidationTrigger.MeasureChanged);
+				((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.MeasureChanged);
 			}
 		}
 
@@ -119,7 +120,7 @@ namespace Xamarin.Forms.Platform.WinRT
 				}
 				else
 				{
-					Element?.InvalidateMeasure(InvalidationTrigger.MeasureChanged);
+					((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.MeasureChanged);
 				}
 			}
 			else
@@ -127,7 +128,7 @@ namespace Xamarin.Forms.Platform.WinRT
 				// The ComboBox is now closed; if we were animating the closure, stop
 				_isAnimating = false;
 				// and force the final redraw
-				Element?.InvalidateMeasure(InvalidationTrigger.MeasureChanged);
+				((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.MeasureChanged);
 			}
 		}
 
@@ -144,7 +145,7 @@ namespace Xamarin.Forms.Platform.WinRT
 				while (_isAnimating)
 				{
 					await Task.Delay(16);
-					await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => Element?.InvalidateMeasure(InvalidationTrigger.MeasureChanged));
+					await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => ((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.MeasureChanged));
 				}
 			});
 		}
diff --git a/Xamarin.Forms.Platform.WinRT/ProgressBarRenderer.cs b/Xamarin.Forms.Platform.WinRT/ProgressBarRenderer.cs
index 87f1e35e..b805b2f6 100644
--- a/Xamarin.Forms.Platform.WinRT/ProgressBarRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/ProgressBarRenderer.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using Windows.UI.Xaml.Controls.Primitives;
+using Xamarin.Forms.Internals;
 
 #if WINDOWS_UWP
 
@@ -53,7 +54,7 @@ namespace Xamarin.Forms.Platform.WinRT
 
 		void ProgressBarOnValueChanged(object sender, RangeBaseValueChangedEventArgs rangeBaseValueChangedEventArgs)
 		{
-			Element?.InvalidateMeasure(InvalidationTrigger.MeasureChanged);
+			((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.MeasureChanged);
 		}
 	}
 }
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.WinRT/TimePickerRenderer.cs b/Xamarin.Forms.Platform.WinRT/TimePickerRenderer.cs
index 8c878b29..0095cdc4 100644
--- a/Xamarin.Forms.Platform.WinRT/TimePickerRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/TimePickerRenderer.cs
@@ -3,6 +3,7 @@ using System.ComponentModel;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
+using Xamarin.Forms.Internals;
 
 #if WINDOWS_UWP
 
@@ -77,12 +78,12 @@ namespace Xamarin.Forms.Platform.WinRT
 		void OnControlTimeChanged(object sender, TimePickerValueChangedEventArgs e)
 		{
 			Element.Time = e.NewTime;
-			Element?.InvalidateMeasure(InvalidationTrigger.SizeRequestChanged);
+			((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.SizeRequestChanged);
 		}
 
 		void PickerOnForceInvalidate(object sender, EventArgs eventArgs)
 		{
-			Element?.InvalidateMeasure(InvalidationTrigger.SizeRequestChanged);
+			((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.SizeRequestChanged);
 		}
 
 		void UpdateTime()