Rewrite of rendering stack

.ncrunch/Avalonia.LinuxFramebuffer.v3.ncrunchproject

@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>

.ncrunch/Avalonia.Visuals.UnitTests.net461.v3.ncrunchproject

@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>

.ncrunch/Avalonia.Win32.Interop.v3.ncrunchproject

@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>

samples/ControlCatalog/MainWindow.xaml.cs

@@ -10,6 +10,7 @@ public MainWindow()
         {
             this.InitializeComponent();
             this.AttachDevTools();
+            Renderer.DrawDirtyRects = Renderer.DrawFps = true;
         }
 
         private void InitializeComponent()

samples/interop/Direct3DInteropSample/Program.cs

@@ -11,7 +11,7 @@ class Program
     {
         static void Main(string[] args)
         {
-            AppBuilder.Configure<App>().UseWin32().UseDirect2D1().Start<MainWindow>();
+            AppBuilder.Configure<App>().UseWin32(deferredRendering: false).UseDirect2D1().Start<MainWindow>();
         }
     }
 }

src/Android/Avalonia.Android/AndroidPlatform.cs

@@ -52,13 +52,11 @@ public static void Initialize(Avalonia.Application app)
                 .Bind<IStandardCursorFactory>().ToTransient<CursorFactory>()
                 .Bind<IKeyboardDevice>().ToSingleton<AndroidKeyboardDevice>()
                 .Bind<IPlatformSettings>().ToConstant(Instance)
-                .Bind<IRendererFactory>().ToConstant(ImmediateRenderer.Factory)
                 .Bind<IPlatformThreadingInterface>().ToConstant(new AndroidThreadingInterface())
                 .Bind<ISystemDialogImpl>().ToTransient<SystemDialogImpl>()
                 .Bind<IWindowingPlatform>().ToConstant(Instance)
                 .Bind<IPlatformIconLoader>().ToSingleton<PlatformIconLoader>()
                 .Bind<IRenderLoop>().ToConstant(new DefaultRenderLoop(60))
-
                 .Bind<IAssetLoader>().ToConstant(new AssetLoader(app.GetType().Assembly));
 
             SkiaPlatform.Initialize();

src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs

@@ -13,6 +13,7 @@
 using Avalonia.Android.Platform.Input;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform.Surfaces;
+using Avalonia.Rendering;
 
 namespace Avalonia.Android.Platform.SkiaPlatform
 {
@@ -85,7 +86,12 @@ public virtual Size ClientSize
         public IPlatformHandle Handle => _view;
 
         public IEnumerable<object> Surfaces => new object[] {this};
-
+
+        public IRenderer CreateRenderer(IRenderRoot root)
+        {
+            return new ImmediateRenderer(root);
+        }
+
         public virtual void Hide()
         {
             _view.Visibility = ViewStates.Invisible;

src/Avalonia.Controls/Platform/ITopLevelImpl.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.Rendering;
 using JetBrains.Annotations;
 
 namespace Avalonia.Platform
@@ -60,6 +61,12 @@ public interface ITopLevelImpl : IDisposable
         /// </summary>
         Action<double> ScalingChanged { get; set; }
 
+        /// <summary>
+        /// Creates a new renderer for the toplevel.
+        /// </summary>
+        /// <param name="root">The toplevel.</param>
+        IRenderer CreateRenderer(IRenderRoot root);
+
         /// <summary>
         /// Invalidates a rect on the toplevel.
         /// </summary>

src/Avalonia.Controls/TopLevel.cs

@@ -90,8 +90,7 @@ public TopLevel(ITopLevelImpl impl, IAvaloniaDependencyResolver dependencyResolv
             _renderInterface = TryGetService<IPlatformRenderInterface>(dependencyResolver);
 
             var renderLoop = TryGetService<IRenderLoop>(dependencyResolver);
-            var rendererFactory = TryGetService<IRendererFactory>(dependencyResolver);
-            Renderer = rendererFactory?.CreateRenderer(this, renderLoop);
+            Renderer = impl.CreateRenderer(this);
 
             impl.SetInputRoot(this);
 
@@ -181,6 +180,9 @@ bool IInputRoot.ShowAccessKeys
         /// <inheritdoc/>
         double ILayoutRoot.LayoutScaling => PlatformImpl?.Scaling ?? 1;
 
+        /// <inheritdoc/>
+        double IRenderRoot.RenderScaling => PlatformImpl?.Scaling ?? 1;
+
         IStyleHost IStyleHost.StylingParent
         {
             get { return AvaloniaLocator.Current.GetService<IGlobalStyles>(); }

src/Avalonia.Controls/Window.cs

@@ -225,8 +225,14 @@ public void Close(object dialogResult)
         /// </summary>
         public override void Hide()
         {
+            if (!IsVisible)
+            {
+                return;
+            }
+
             using (BeginAutoSizing())
             {
+                Renderer?.Stop();
                 PlatformImpl?.Hide();
             }
 
@@ -252,6 +258,7 @@ public override void Show()
             using (BeginAutoSizing())
             {
                 PlatformImpl?.Show();
+                Renderer?.Start();
             }
         }
 
@@ -297,6 +304,8 @@ public Task<TResult> ShowDialog<TResult>()
                 var modal = PlatformImpl?.ShowDialog();
                 var result = new TaskCompletionSource<TResult>();
 
+                Renderer?.Start();
+
                 Observable.FromEventPattern<EventHandler, EventArgs>(
                     x => this.Closed += x,
                     x => this.Closed -= x)

src/Avalonia.Controls/WindowBase.cs

@@ -117,6 +117,7 @@ public virtual void Hide()
 
             try
             {
+                Renderer?.Stop();
                 PlatformImpl?.Hide();
                 IsVisible = false;
             }
@@ -145,6 +146,7 @@ public virtual void Show()
                 }
 
                 PlatformImpl?.Show();
+                Renderer?.Start();
             }
             finally
             {

src/Avalonia.Themes.Default/CheckBox.xaml

@@ -1,10 +1,11 @@
 <Styles xmlns="https://github.com/avaloniaui">
   <Style Selector="CheckBox">
+    <Setter Property="Background" Value="Transparent"/>
     <Setter Property="BorderBrush" Value="{StyleResource ThemeBorderMidBrush}"/>
     <Setter Property="BorderThickness" Value="{StyleResource ThemeBorderThickness}"/>
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid ColumnDefinitions="Auto,*">
+        <Grid ColumnDefinitions="Auto,*" Background="{TemplateBinding Background}">
           <Border Name="border"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"

src/Avalonia.Themes.Default/DropDownItem.xaml

@@ -1,5 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui">
   <Style Selector="DropDownItem">
+    <Setter Property="Background" Value="Transparent"/>
     <Setter Property="Padding" Value="2"/>
     <Setter Property="HorizontalAlignment" Value="Stretch"/>
     <Setter Property="HorizontalContentAlignment" Value="Left"/>

src/Avalonia.Themes.Default/ListBox.xaml

@@ -1,13 +1,13 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="ListBox">
+  <Setter Property="Background" Value="{StyleResource ThemeBackgroundBrush}"/>
   <Setter Property="BorderBrush" Value="{StyleResource ThemeBorderMidBrush}"/>
   <Setter Property="BorderThickness" Value="{StyleResource ThemeBorderThickness}"/>
   <Setter Property="Padding" Value="4"/>
   <Setter Property="Template">
     <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
+      <Border BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}">
-        <ScrollViewer Name="PART_ScrollViewer">
+        <ScrollViewer Name="PART_ScrollViewer" Background="{TemplateBinding Background}">
           <ItemsPresenter Name="PART_ItemsPresenter"
                           Items="{TemplateBinding Items}"
                           ItemsPanel="{TemplateBinding ItemsPanel}"

src/Avalonia.Themes.Default/ListBoxItem.xaml

@@ -1,5 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui">
   <Style Selector="ListBoxItem">
+    <Setter Property="Background" Value="Transparent"/>
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"

src/Avalonia.Themes.Default/MenuItem.xaml

@@ -2,6 +2,7 @@
         xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
   <Style Selector="MenuItem">
+    <Setter Property="Background" Value="Transparent"/>
     <Setter Property="BorderThickness" Value="1"/>
     <Setter Property="Padding" Value="6,0"/>
     <Setter Property="Template">

src/Avalonia.Themes.Default/RadioButton.xaml

@@ -1,10 +1,11 @@
 <Styles xmlns="https://github.com/avaloniaui">
   <Style Selector="RadioButton">
+    <Setter Property="Background" Value="Transparent"/>
     <Setter Property="BorderBrush" Value="{StyleResource ThemeBorderMidBrush}"/>
     <Setter Property="BorderThickness" Value="{StyleResource ThemeBorderThickness}"/>
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid ColumnDefinitions="Auto,*">
+        <Grid ColumnDefinitions="Auto,*" Background="{TemplateBinding Background}">
           <Ellipse Name="border"
                    Stroke="{TemplateBinding BorderBrush}"
                    StrokeThickness="{TemplateBinding BorderThickness}"

src/Avalonia.Themes.Default/ScrollViewer.xaml

@@ -1,8 +1,9 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="ScrollViewer">
   <Setter Property="Template">
     <ControlTemplate>
-      <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto" Background="{TemplateBinding Background}">
+      <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
         <ScrollContentPresenter Name="PART_ContentPresenter"
+                                Background="{TemplateBinding Background}"
                                 Content="{TemplateBinding Content}"
                                 Extent="{TemplateBinding Path=Extent, Mode=TwoWay}"
                                 Margin="{TemplateBinding Padding}"

src/Avalonia.Themes.Default/TabStripItem.xaml

@@ -1,5 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui">
   <Style Selector="TabStripItem">
+    <Setter Property="Background" Value="Transparent"/>
     <Setter Property="FontSize" Value="{StyleResource FontSizeLarge}"/>
     <Setter Property="Foreground" Value="{StyleResource ThemeForegroundLightBrush}"/>
     <Setter Property="Template">

src/Avalonia.Themes.Default/TreeView.xaml

@@ -1,13 +1,13 @@
 <Style xmlns="https://github.com/avaloniaui" Selector="TreeView">
+  <Setter Property="Background" Value="Transparent"/>
   <Setter Property="BorderBrush" Value="{StyleResource ThemeBorderMidBrush}"/>
   <Setter Property="BorderThickness" Value="{StyleResource ThemeBorderThickness}"/>
   <Setter Property="Padding" Value="4"/>
   <Setter Property="Template">
     <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
+      <Border BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="{TemplateBinding BorderThickness}">
-        <ScrollViewer CanScrollHorizontally="True">
+        <ScrollViewer CanScrollHorizontally="True" Background="{TemplateBinding Background}">
           <ItemsPresenter Name="PART_ItemsPresenter"
                           Items="{TemplateBinding Items}"
                           ItemsPanel="{TemplateBinding ItemsPanel}"

src/Avalonia.Themes.Default/TreeViewItem.xaml

@@ -31,7 +31,8 @@
   <Style Selector="TreeViewItem /template/ ToggleButton#expander">
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Width="14"
+        <Border Background="Transparent"
+                Width="14"
                 Height="12"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center">

src/Avalonia.Visuals/Media/BrushExtensions.cs

@@ -0,0 +1,51 @@
+using System;
+
+namespace Avalonia.Media
+{
+    /// <summary>
+    /// Extension methods for brush classes.
+    /// </summary>
+    public static class BrushExtensions
+    {
+        /// <summary>
+        /// Converts a brush to an immutable brush.
+        /// </summary>
+        /// <param name="brush">The brush.</param>
+        /// <returns>
+        /// The result of calling <see cref="IMutableBrush.ToImmutable"/> if the brush is mutable,
+        /// otherwise <paramref name="brush"/>.
+        /// </returns>
+        public static IBrush ToImmutable(this IBrush brush)
+        {
+            Contract.Requires<ArgumentNullException>(brush != null);
+
+            return (brush as IMutableBrush)?.ToImmutable() ?? brush;
+        }
+
+        /// <summary>
+        /// Converts a pen to a pen with an immutable brush
+        /// </summary>
+        /// <param name="pen">The pen.</param>
+        /// <returns>
+        /// A copy of the pen with an immutable brush, or <paramref name="pen"/> if the pen's brush
+        /// is already immutable or null.
+        /// </returns>
+        public static Pen ToImmutable(this Pen pen)
+        {
+            Contract.Requires<ArgumentNullException>(pen != null);
+
+            var brush = pen?.Brush?.ToImmutable();
+            return pen == null || ReferenceEquals(pen?.Brush, brush) ?
+                pen :
+                new Pen(
+                    brush,
+                    thickness: pen.Thickness,
+                    dashStyle: pen.DashStyle,
+                    dashCap: pen.DashCap,
+                    startLineCap: pen.StartLineCap,
+                    endLineCap: pen.EndLineCap,
+                    lineJoin: pen.LineJoin,
+                    miterLimit: pen.MiterLimit);
+        }
+    }
+}

src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs

@@ -3,7 +3,6 @@
 
 using System;
 using Avalonia.Media;
-using Avalonia.Platform;
 
 namespace Avalonia.Platform
 {
@@ -32,6 +31,15 @@ public interface IDrawingContextImpl : IDisposable
         /// <param name="destRect">The rect in the output to draw to.</param>
         void DrawImage(IBitmapImpl source, double opacity, Rect sourceRect, Rect destRect);
 
+        /// <summary>
+        /// Draws a bitmap image.
+        /// </summary>
+        /// <param name="source">The bitmap image.</param>
+        /// <param name="opacityMask">The opacity mask to draw with.</param>
+        /// <param name="opacityMaskRect">The destination rect for the opacity mask.</param>
+        /// <param name="destRect">The rect in the output to draw to.</param>
+        void DrawImage(IBitmapImpl source, IBrush opacityMask, Rect opacityMaskRect, Rect destRect);
+
         /// <summary>
         /// Draws a line.
         /// </summary>
@@ -100,4 +108,4 @@ public interface IDrawingContextImpl : IDisposable
 
         void PopGeometryClip();
     }
-}
+}

src/Avalonia.Visuals/Properties/AssemblyInfo.cs

@@ -2,8 +2,14 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
 [assembly: AssemblyTitle("Avalonia.Visuals")]
+[assembly: InternalsVisibleTo("Avalonia.Visuals.UnitTests")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")]
+
+[assembly: InternalsVisibleTo("Avalonia.Cairo.RenderTests")]
+[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests")]
+[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests")]