Implicit impl of controller ifaces (#807)

* Simplify ICtrl callsites

* Rebase fix

13 files changed, 77 insertions, 96 deletions

diff --git a/Xamarin.Forms.Platform.WinRT/CarouselPageRenderer.cs b/Xamarin.Forms.Platform.WinRT/CarouselPageRenderer.cs
index 33e09399..8f732d2f 100644
--- a/Xamarin.Forms.Platform.WinRT/CarouselPageRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/CarouselPageRenderer.cs
@@ -47,7 +47,7 @@ namespace Xamarin.Forms.Platform.WinRT
 			get { return Element; }
 		}
 
-		IPageController PageController => Element as IPageController;
+		Page Page => Element as Page;
 
 		public event EventHandler<VisualElementChangedEventArgs> ElementChanged;
 
@@ -86,7 +86,7 @@ namespace Xamarin.Forms.Platform.WinRT
 
 			if (oldPage != null)
 			{
-				((IPageController)oldPage).SendDisappearing();
+				oldPage.SendDisappearing();
 				((INotifyCollectionChanged)oldPage.Children).CollectionChanged -= OnChildrenChanged;
 				oldPage.PropertyChanged -= OnElementPropertyChanged;
 			}
@@ -111,7 +111,7 @@ namespace Xamarin.Forms.Platform.WinRT
 				newPage.PropertyChanged += OnElementPropertyChanged;
 
 				UpdateCurrentPage();
-				((IPageController)newPage).SendAppearing();
+				newPage.SendAppearing();
 			}
 
 			OnElementChanged(new ElementChangedEventArgs<CarouselPage>(oldPage, newPage));
@@ -132,7 +132,7 @@ namespace Xamarin.Forms.Platform.WinRT
 			}
 
 			_disposed = true;
-			PageController?.SendDisappearing();
+			Page?.SendDisappearing();
 			SetElement(null);
 		}
 
@@ -158,7 +158,7 @@ namespace Xamarin.Forms.Platform.WinRT
 
 		void OnLoaded(object sender, RoutedEventArgs e)
 		{
-			PageController?.SendAppearing();
+			Page?.SendAppearing();
 		}
 
 		void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -170,14 +170,14 @@ namespace Xamarin.Forms.Platform.WinRT
 			ContentPage currentPage = Element.CurrentPage;
 			if (currentPage == page)
 				return;
-			((IPageController)currentPage)?.SendDisappearing();
+			currentPage?.SendDisappearing();
 			Element.CurrentPage = page;
-			((IPageController)page)?.SendAppearing();
+			page?.SendAppearing();
 		}
 
 		void OnUnloaded(object sender, RoutedEventArgs e)
 		{
-			PageController?.SendDisappearing();
+			Page?.SendDisappearing();
 		}
 
 		void UpdateCurrentPage()
diff --git a/Xamarin.Forms.Platform.WinRT/CellControl.cs b/Xamarin.Forms.Platform.WinRT/CellControl.cs
index 0ad7adfd..ffc90bae 100644
--- a/Xamarin.Forms.Platform.WinRT/CellControl.cs
+++ b/Xamarin.Forms.Platform.WinRT/CellControl.cs
@@ -42,9 +42,8 @@ namespace Xamarin.Forms.Platform.WinRT
 
 			Unloaded += (sender, args) =>
 			{
-				ICellController cell = Cell;
-				if (cell != null)
-					cell.SendDisappearing();
+				if (Cell != null)
+					Cell.SendDisappearing();
 			};
 
 			_propertyChangedHandler = OnCellPropertyChanged;
@@ -230,12 +229,10 @@ namespace Xamarin.Forms.Platform.WinRT
 				}
 				else
 				{
-					IListViewController listViewController = lv;
-
 					if (isGroupHeader)
-						bindingContext = listViewController.GetDisplayTextFromGroup(bindingContext);
+						bindingContext = lv.GetDisplayTextFromGroup(bindingContext);
 
-					cell = listViewController.CreateDefaultCell(bindingContext);
+					cell = lv.CreateDefaultCell(bindingContext);
 				}
 
 				// A TableView cell should already have its parent,
@@ -258,12 +255,12 @@ namespace Xamarin.Forms.Platform.WinRT
 			if (oldCell != null)
 			{
 				oldCell.PropertyChanged -= _propertyChangedHandler;
-				((ICellController)oldCell).SendDisappearing();
+				oldCell.SendDisappearing();
 			}
 
 			if (newCell != null)
 			{
-				((ICellController)newCell).SendAppearing();
+				newCell.SendAppearing();
 
 				UpdateContent(newCell);
 				SetupContextMenu();
diff --git a/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs b/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs
index 16715685..8798b20e 100644
--- a/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/ImageRenderer.cs
@@ -91,13 +91,13 @@ namespace Xamarin.Forms.Platform.WinRT
 				RefreshImage();
 			}
 
-			((IImageController)Element)?.SetIsLoading(false);
+			Element?.SetIsLoading(false);
 		}
 
 		void OnImageFailed(object sender, ExceptionRoutedEventArgs exceptionRoutedEventArgs)
 		{
 			Log.Warning("Image Loading", $"Image failed to load: {exceptionRoutedEventArgs.ErrorMessage}" );
-			((IImageController)Element)?.SetIsLoading(false);
+			Element?.SetIsLoading(false);
 		}
 
 		void RefreshImage()
@@ -122,7 +122,7 @@ namespace Xamarin.Forms.Platform.WinRT
 
 		async Task UpdateSource()
 		{
-			((IImageController)Element).SetIsLoading(true);
+			Element.SetIsLoading(true);
 
 			ImageSource source = Element.Source;
 			IImageSourceHandler handler;
@@ -155,7 +155,7 @@ namespace Xamarin.Forms.Platform.WinRT
 			else
 			{
 				Control.Source = null;
-				((IImageController)Element)?.SetIsLoading(false);
+				Element?.SetIsLoading(false);
 			}
 		}
 	}
diff --git a/Xamarin.Forms.Platform.WinRT/ListViewRenderer.cs b/Xamarin.Forms.Platform.WinRT/ListViewRenderer.cs
index 031e2cf3..a5ed5169 100644
--- a/Xamarin.Forms.Platform.WinRT/ListViewRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/ListViewRenderer.cs
@@ -25,7 +25,6 @@ namespace Xamarin.Forms.Platform.WinRT
 {
 	public class ListViewRenderer : ViewRenderer<ListView, FrameworkElement>
 	{
-		IListViewController Controller => Element;
 		ITemplatedItemsView<Cell> TemplatedItemsView => Element;
 
 
@@ -53,13 +52,13 @@ namespace Xamarin.Forms.Platform.WinRT
 			if (e.OldElement != null)
 			{
 				e.OldElement.ItemSelected -= OnElementItemSelected;
-				((IListViewController)e.OldElement).ScrollToRequested -= OnElementScrollToRequested;
+				e.OldElement.ScrollToRequested -= OnElementScrollToRequested;
 			}
 
 			if (e.NewElement != null)
 			{
 				e.NewElement.ItemSelected += OnElementItemSelected;
-				((IListViewController)e.NewElement).ScrollToRequested += OnElementScrollToRequested;
+				e.NewElement.ScrollToRequested += OnElementScrollToRequested;
 
 				if (List == null)
 				{
@@ -201,12 +200,12 @@ namespace Xamarin.Forms.Platform.WinRT
 
 		void UpdateFooter()
 		{
-			List.Footer = Controller.FooterElement;
+			List.Footer = Element.FooterElement;
 		}
 
 		void UpdateHeader()
 		{
-			List.Header = Controller.HeaderElement;
+			List.Header = Element.HeaderElement;
 		}
 
 		void UpdateGrouping()
@@ -479,7 +478,7 @@ namespace Xamarin.Forms.Platform.WinRT
 			}
 #endif
 
-			Controller.NotifyRowTapped(index, cell: null);
+			Element.NotifyRowTapped(index, cell: null);
 
 #if !WINDOWS_UWP
 
diff --git a/Xamarin.Forms.Platform.WinRT/MasterDetailPageRenderer.cs b/Xamarin.Forms.Platform.WinRT/MasterDetailPageRenderer.cs
index dfeb3921..12e587ec 100644
--- a/Xamarin.Forms.Platform.WinRT/MasterDetailPageRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/MasterDetailPageRenderer.cs
@@ -57,8 +57,6 @@ namespace Xamarin.Forms.Platform.WinRT
 			set { _container.ToolbarForeground = value; }
 		}
 
-		IMasterDetailPageController MasterDetailPageController => Element as IMasterDetailPageController;
-
 		bool ITitleProvider.ShowTitle
 		{
 			get { return _showTitle; }
@@ -179,7 +177,7 @@ namespace Xamarin.Forms.Platform.WinRT
 		bool GetIsMasterAPopover()
 		{
 			// TODO: Support tablet being shrunk to a very small size
-			return !MasterDetailPageController.ShouldShowSplitMode;
+			return !Element.ShouldShowSplitMode;
 		}
 
 		void OnLoaded(object sender, RoutedEventArgs args)
@@ -273,8 +271,8 @@ namespace Xamarin.Forms.Platform.WinRT
 			if (!isPopover)
 				detailWidth -= masterWidth;
 
-			MasterDetailPageController.MasterBounds = new Rectangle(0, 0, masterWidth, constraint.Height);
-			MasterDetailPageController.DetailBounds = new Rectangle(0, 0, detailWidth, constraint.Height);
+			Element.MasterBounds = new Rectangle(0, 0, masterWidth, constraint.Height);
+			Element.DetailBounds = new Rectangle(0, 0, detailWidth, constraint.Height);
 		}
 
 		void UpdateIsPresented()
diff --git a/Xamarin.Forms.Platform.WinRT/MenuItemCommand.cs b/Xamarin.Forms.Platform.WinRT/MenuItemCommand.cs
index 6f65f315..31574b44 100644
--- a/Xamarin.Forms.Platform.WinRT/MenuItemCommand.cs
+++ b/Xamarin.Forms.Platform.WinRT/MenuItemCommand.cs
@@ -13,7 +13,6 @@ namespace Xamarin.Forms.Platform.WinRT
 	internal class MenuItemCommand : ICommand
 	{
 		readonly MenuItem _menuItem;
-		IMenuItemController Controller => _menuItem;
 
 		public MenuItemCommand(MenuItem item)
 		{
@@ -23,14 +22,14 @@ namespace Xamarin.Forms.Platform.WinRT
 
 		public virtual bool CanExecute(object parameter)
 		{
-			return Controller.IsEnabled;
+			return _menuItem.IsEnabled;
 		}
 
 		public event EventHandler CanExecuteChanged;
 
 		public void Execute(object parameter)
 		{
-			Controller.Activate();
+			_menuItem.Activate();
 		}
 
 		void OnCanExecuteChanged()
diff --git a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs
index 9f141504..7745f9dc 100644
--- a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs
@@ -76,8 +76,6 @@ namespace Xamarin.Forms.Platform.WinRT
 			}
 		}
 
-		IPageController PageController => Element as IPageController;
-
 		bool ITitleProvider.ShowTitle
 		{
 			get { return _showTitle; }
@@ -152,10 +150,10 @@ namespace Xamarin.Forms.Platform.WinRT
 
 			if (oldElement != null)
 			{
-				((INavigationPageController)oldElement).PushRequested -= OnPushRequested;
-				((INavigationPageController)oldElement).PopRequested -= OnPopRequested;
-				((INavigationPageController)oldElement).PopToRootRequested -= OnPopToRootRequested;
-				((IPageController)oldElement).InternalChildren.CollectionChanged -= OnChildrenChanged;
+				oldElement.PushRequested -= OnPushRequested;
+				oldElement.PopRequested -= OnPopRequested;
+				oldElement.PopToRootRequested -= OnPopToRootRequested;
+				oldElement.InternalChildren.CollectionChanged -= OnChildrenChanged;
 				oldElement.PropertyChanged -= OnElementPropertyChanged;
 			}
 
@@ -190,10 +188,10 @@ namespace Xamarin.Forms.Platform.WinRT
 #endif
 
 				Element.PropertyChanged += OnElementPropertyChanged;
-				((INavigationPageController)Element).PushRequested += OnPushRequested;
-				((INavigationPageController)Element).PopRequested += OnPopRequested;
-				((INavigationPageController)Element).PopToRootRequested += OnPopToRootRequested;
-				PageController.InternalChildren.CollectionChanged += OnChildrenChanged;
+				Element.PushRequested += OnPushRequested;
+				Element.PopRequested += OnPopRequested;
+				Element.PopToRootRequested += OnPopToRootRequested;
+				Element.InternalChildren.CollectionChanged += OnChildrenChanged;
 
 				if (!string.IsNullOrEmpty(Element.AutomationId))
 					_container.SetValue(AutomationProperties.AutomationIdProperty, Element.AutomationId);
@@ -211,7 +209,7 @@ namespace Xamarin.Forms.Platform.WinRT
 				return;
 			}
 
-			PageController?.SendDisappearing();
+			Element?.SendDisappearing();
 			_disposed = true;
 
 			_container.PointerPressed -= OnPointerPressed;
@@ -340,7 +338,7 @@ namespace Xamarin.Forms.Platform.WinRT
 #if WINDOWS_UWP
 			_navManager = SystemNavigationManager.GetForCurrentView();
 #endif
-			PageController.SendAppearing();
+			Element.SendAppearing();
 			UpdateBackButton();
 			UpdateTitleOnParents();
 		}
@@ -371,7 +369,7 @@ namespace Xamarin.Forms.Platform.WinRT
 
 		void OnPopRequested(object sender, NavigationRequestedEventArgs e)
 		{
-			var newCurrent = ((INavigationPageController)Element).Peek(1);
+			var newCurrent = Element.Peek(1);
 			SetPage(newCurrent, e.Animated, true);
 		}
 
@@ -387,12 +385,12 @@ namespace Xamarin.Forms.Platform.WinRT
 
 		void OnUnloaded(object sender, RoutedEventArgs args)
 		{
-			PageController?.SendDisappearing();
+			Element?.SendDisappearing();
 		}
 
 		void PushExistingNavigationStack()
 		{
-			foreach (var page in ((INavigationPageController)Element).Pages)
+			foreach (var page in Element.Pages)
 			{
 				SetPage(page, false, false);
 			}
@@ -454,7 +452,7 @@ namespace Xamarin.Forms.Platform.WinRT
 
 		void UpdateContainerArea()
 		{
-			PageController.ContainerArea = new Rectangle(0, 0, _container.ContentWidth, _container.ContentHeight);
+			Element.ContainerArea = new Rectangle(0, 0, _container.ContentWidth, _container.ContentHeight);
 		}
 
 		void UpdateNavigationBarBackground()
diff --git a/Xamarin.Forms.Platform.WinRT/NavigationPageRendererWinRT.cs b/Xamarin.Forms.Platform.WinRT/NavigationPageRendererWinRT.cs
index 1539d3aa..75e0edfe 100644
--- a/Xamarin.Forms.Platform.WinRT/NavigationPageRendererWinRT.cs
+++ b/Xamarin.Forms.Platform.WinRT/NavigationPageRendererWinRT.cs
@@ -17,7 +17,7 @@
 
 		void UpdateBackButton()
 		{
-			bool showBackButton = PageController.InternalChildren.Count > 1 && NavigationPage.GetHasBackButton(_currentPage);
+			bool showBackButton = Element.InternalChildren.Count > 1 && NavigationPage.GetHasBackButton(_currentPage);
 			_container.ShowBackButton = showBackButton;
 		}
 
diff --git a/Xamarin.Forms.Platform.WinRT/PageRenderer.cs b/Xamarin.Forms.Platform.WinRT/PageRenderer.cs
index 708c13b2..6a8e1a39 100644
--- a/Xamarin.Forms.Platform.WinRT/PageRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/PageRenderer.cs
@@ -15,8 +15,6 @@ namespace Xamarin.Forms.Platform.WinRT
 
 		bool _loaded;
 
-		IPageController PageController => Element as IPageController;
-
 		protected override void Dispose(bool disposing)
 		{
 			if (!disposing || _disposed)
@@ -32,7 +30,7 @@ namespace Xamarin.Forms.Platform.WinRT
 					var visualChild = children[i] as VisualElement;
 					visualChild?.Cleanup();
 				}
-				PageController?.SendDisappearing();
+				Element?.SendDisappearing();
 			}
 
 			base.Dispose();
@@ -42,7 +40,7 @@ namespace Xamarin.Forms.Platform.WinRT
 		{
 			base.OnElementChanged(e);
 
-			((IPageController)e.OldElement)?.SendDisappearing();
+			e.OldElement?.SendDisappearing();
 
 			if (e.NewElement != null)
 			{
@@ -55,7 +53,7 @@ namespace Xamarin.Forms.Platform.WinRT
 				}
 
 				if (_loaded)
-					((IPageController)e.NewElement).SendAppearing();
+					e.NewElement.SendAppearing();
 			}
 		}
 
@@ -67,13 +65,13 @@ namespace Xamarin.Forms.Platform.WinRT
 				return;
 			}
 			_loaded = true;
-			PageController?.SendAppearing();
+			Element?.SendAppearing();
 		}
 
 		void OnUnloaded(object sender, RoutedEventArgs args)
 		{
 			_loaded = false;
-			PageController?.SendDisappearing();
+			Element?.SendDisappearing();
 		}
 	}
 }
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.WinRT/ScrollViewRenderer.cs b/Xamarin.Forms.Platform.WinRT/ScrollViewRenderer.cs
index 0be6ba28..2fa8b80e 100644
--- a/Xamarin.Forms.Platform.WinRT/ScrollViewRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/ScrollViewRenderer.cs
@@ -21,11 +21,6 @@ namespace Xamarin.Forms.Platform.WinRT
 			AutoPackage = false;
 		}
 
-		protected IScrollViewController Controller
-		{
-			get { return Element; }
-		}
-
 		public override SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint)
 		{
 			SizeRequest result = base.GetDesiredSize(widthConstraint, heightConstraint);
@@ -77,7 +72,7 @@ namespace Xamarin.Forms.Platform.WinRT
 
 			if (e.OldElement != null)
 			{
-				((IScrollViewController)e.OldElement).ScrollToRequested -= OnScrollToRequested;
+				e.OldElement.ScrollToRequested -= OnScrollToRequested;
 			}
 
 			if (e.NewElement != null)
@@ -89,7 +84,7 @@ namespace Xamarin.Forms.Platform.WinRT
 					Control.ViewChanged += OnViewChanged;
 				}
 
-				Controller.ScrollToRequested += OnScrollToRequested;
+				Element.ScrollToRequested += OnScrollToRequested;
 
 				UpdateOrientation();
 
@@ -136,7 +131,7 @@ namespace Xamarin.Forms.Platform.WinRT
 			ScrollToMode mode = e.Mode;
 			if (mode == ScrollToMode.Element)
 			{
-				Point pos = Controller.GetScrollPositionForElement((VisualElement)e.Element, e.Position);
+				Point pos = Element.GetScrollPositionForElement((VisualElement)e.Element, e.Position);
 				x = pos.X;
 				y = pos.Y;
 				mode = ScrollToMode.Position;
@@ -146,15 +141,15 @@ namespace Xamarin.Forms.Platform.WinRT
 			{
 				Control.ChangeView(x, y, null, !e.ShouldAnimate);
 			}
-			Controller.SendScrollFinished();
+			Element.SendScrollFinished();
 		}
 
 		void OnViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
 		{
-			Controller.SetScrolledPosition(Control.HorizontalOffset, Control.VerticalOffset);
+			Element.SetScrolledPosition(Control.HorizontalOffset, Control.VerticalOffset);
 
 			if (!e.IsIntermediate)
-				Controller.SendScrollFinished();
+				Element.SendScrollFinished();
 		}
 
 		void UpdateMargins()
diff --git a/Xamarin.Forms.Platform.WinRT/TableViewRenderer.cs b/Xamarin.Forms.Platform.WinRT/TableViewRenderer.cs
index 7f12daab..c313cff0 100644
--- a/Xamarin.Forms.Platform.WinRT/TableViewRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/TableViewRenderer.cs
@@ -13,7 +13,6 @@ namespace Xamarin.Forms.Platform.WinRT
 	public class TableViewRenderer : ViewRenderer<TableView, Windows.UI.Xaml.Controls.ListView>
 	{
 		bool _ignoreSelectionEvent;
-		ITableViewController Controller => Element;
 
 		public override SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint)
 		{
@@ -26,7 +25,7 @@ namespace Xamarin.Forms.Platform.WinRT
 		{
 			if (e.OldElement != null)
 			{
-				((ITableViewController)e.OldElement).ModelChanged -= OnModelChanged;
+				e.OldElement.ModelChanged -= OnModelChanged;
 			}
 
 			if (e.NewElement != null)
@@ -47,7 +46,7 @@ namespace Xamarin.Forms.Platform.WinRT
 					Control.SelectionChanged += OnSelectionChanged;
 				}
 
-				((ITableViewController)e.NewElement).ModelChanged += OnModelChanged;
+				e.NewElement.ModelChanged += OnModelChanged;
 				OnModelChanged(e.NewElement, EventArgs.Empty);
 			}
 
@@ -75,7 +74,7 @@ namespace Xamarin.Forms.Platform.WinRT
 					if (cell != null)
 					{
 						if (cell.IsEnabled)
-							Controller.Model.RowSelected(cell);
+							Element.Model.RowSelected(cell);
 						break;
 					}
 				}
diff --git a/Xamarin.Forms.Platform.WinRT/VisualElementTracker.cs b/Xamarin.Forms.Platform.WinRT/VisualElementTracker.cs
index 06c72b9a..d477028f 100644
--- a/Xamarin.Forms.Platform.WinRT/VisualElementTracker.cs
+++ b/Xamarin.Forms.Platform.WinRT/VisualElementTracker.cs
@@ -261,9 +261,9 @@ namespace Xamarin.Forms.Platform.WinRT
 			{
 				if (!_wasPanGestureStartedSent)
 				{
-					((IPanGestureController)recognizer).SendPanStarted(view, Application.Current.PanGestureId);
+					recognizer.SendPanStarted(view, Application.Current.PanGestureId);
 				}
-				((IPanGestureController)recognizer).SendPan(view, e.Delta.Translation.X + e.Cumulative.Translation.X, e.Delta.Translation.Y + e.Cumulative.Translation.Y, Application.Current.PanGestureId);
+				recognizer.SendPan(view, e.Delta.Translation.X + e.Cumulative.Translation.X, e.Delta.Translation.Y + e.Cumulative.Translation.Y, Application.Current.PanGestureId);
 			}
 			_wasPanGestureStartedSent = true;
 		}
@@ -283,9 +283,9 @@ namespace Xamarin.Forms.Platform.WinRT
 			{
 				if (!_wasPinchGestureStartedSent)
 				{
-					((IPinchGestureController)recognizer).SendPinchStarted(view, scaleOriginPoint);
+					recognizer.SendPinchStarted(view, scaleOriginPoint);
 				}
-				((IPinchGestureController)recognizer).SendPinch(view, e.Delta.Scale, scaleOriginPoint);
+				recognizer.SendPinch(view, e.Delta.Scale, scaleOriginPoint);
 			}
 			_wasPinchGestureStartedSent = true;
 		}
@@ -413,11 +413,11 @@ namespace Xamarin.Forms.Platform.WinRT
 			{
 				if (success)
 				{
-					((IPanGestureController)recognizer).SendPanCompleted(view, Application.Current.PanGestureId);
+					recognizer.SendPanCompleted(view, Application.Current.PanGestureId);
 				}
 				else
 				{
-					((IPanGestureController)recognizer).SendPanCanceled(view, Application.Current.PanGestureId);
+					recognizer.SendPanCanceled(view, Application.Current.PanGestureId);
 				}
 			}
 
@@ -436,11 +436,11 @@ namespace Xamarin.Forms.Platform.WinRT
 			{
 				if (success)
 				{
-					((IPinchGestureController)recognizer).SendPinchEnded(view);
+					recognizer.SendPinchEnded(view);
 				}
 				else
 				{
-					((IPinchGestureController)recognizer).SendPinchCanceled(view);
+					recognizer.SendPinchCanceled(view);
 				}
 			}
 
diff --git a/Xamarin.Forms.Platform.WinRT/WebViewRenderer.cs b/Xamarin.Forms.Platform.WinRT/WebViewRenderer.cs
index c768bb5f..9cb2b601 100644
--- a/Xamarin.Forms.Platform.WinRT/WebViewRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/WebViewRenderer.cs
@@ -31,8 +31,6 @@ var bases = head.getElementsByTagName('base');
 if(bases.length == 0){
     head.innerHTML = 'baseTag' + head.innerHTML;
 }";
-		IWebViewController ElementController => Element;
-
 		public void LoadHtml(string html, string baseUrl)
 		{
 			if (IsNullOrEmpty(baseUrl))
@@ -99,10 +97,10 @@ if(bases.length == 0){
 
 			if (e.OldElement != null)
 			{
-				var oldElementController = e.OldElement as IWebViewController;
-				oldElementController.EvalRequested -= OnEvalRequested;
-				oldElementController.GoBackRequested -= OnGoBackRequested;
-				oldElementController.GoForwardRequested -= OnGoForwardRequested;
+				var oldElement = e.OldElement;
+				oldElement.EvalRequested -= OnEvalRequested;
+				oldElement.GoBackRequested -= OnGoBackRequested;
+				oldElement.GoForwardRequested -= OnGoForwardRequested;
 			}
 
 			if (e.NewElement != null)
@@ -116,10 +114,10 @@ if(bases.length == 0){
 					SetNativeControl(webView);
 				}
 
-				var newElementController = e.NewElement as IWebViewController;
-				newElementController.EvalRequested += OnEvalRequested;
-				newElementController.GoForwardRequested += OnGoForwardRequested;
-				newElementController.GoBackRequested += OnGoBackRequested;
+				var newElement = e.NewElement;
+				newElement.EvalRequested += OnEvalRequested;
+				newElement.GoForwardRequested += OnGoForwardRequested;
+				newElement.GoBackRequested += OnGoBackRequested;
 
 				Load();
 			}
@@ -193,7 +191,7 @@ if(bases.length == 0){
 			{
 				var args = new WebNavigatingEventArgs(_eventState, new UrlWebViewSource { Url = uri.AbsoluteUri }, uri.AbsoluteUri);
 
-				ElementController.SendNavigating(args);
+				Element.SendNavigating(args);
 				e.Cancel = args.Cancel;
 
 				// reset in this case because this is the last event we will get
@@ -208,7 +206,7 @@ if(bases.length == 0){
 			((IElementController)Element).SetValueFromRenderer(WebView.SourceProperty, source);
 			_updating = false;
 
-			ElementController.SendNavigated(new WebNavigatedEventArgs(evnt, source, source.Url, result));
+			Element.SendNavigated(new WebNavigatedEventArgs(evnt, source, source.Url, result));
 
 			UpdateCanGoBackForward();
 			_eventState = WebNavigationEvent.NewPage;
@@ -216,8 +214,8 @@ if(bases.length == 0){
 
 		void UpdateCanGoBackForward()
 		{
-			ElementController.CanGoBack = Control.CanGoBack;
-			ElementController.CanGoForward = Control.CanGoForward;
+			((IWebViewController)Element).CanGoBack = Control.CanGoBack;
+			((IWebViewController)Element).CanGoForward = Control.CanGoForward;
 		}
 	}
 }
\ No newline at end of file