perf: Misc linker hints updates

Adds various pre-checks for linker hint substitutions to improve XAML trimming.
unoplatform · Nov 22, 2022 · e927734 · e927734
1 parent be63194
commit e927734
Show file tree

Hide file tree

Showing 9 changed files with 250 additions and 135 deletions.
diff --git a/src/AddIns/Uno.UI.Lottie/AssemblyInfo.cs b/src/AddIns/Uno.UI.Lottie/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Reflection;
+
+[assembly: AssemblyMetadata("IsTrimmable", "True")]
diff --git a/src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.Wasm.csproj b/src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.Wasm.csproj
@@ -73,4 +73,8 @@
 		<Copy SourceFiles="@(_OutputFilesPDB)" DestinationFiles="@(_OutputFilesPDB->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename).pdb')" />
 	</Target>
 
+	<ItemGroup>
+	  <SourceGeneratorInput Remove="AssemblyInfo.cs" />
+	</ItemGroup>
+
 </Project>
diff --git a/...rs/Uno.UI.SourceGenerators/BindableTypeProviders/DependencyObjectAvailabilityGenerator.cs b/...rs/Uno.UI.SourceGenerators/BindableTypeProviders/DependencyObjectAvailabilityGenerator.cs
@@ -94,6 +94,17 @@ from type in module.GlobalNamespace.GetNamespaceTypes()
 						bindableTypes = bindableTypes.ToArray();
 
 						context.AddSource("DependencyObjectAvailability", GenerateTypeProviders(bindableTypes));
+						context.AddSource("DependencyObjectAvailability_Debug",
+							$"""
+							/*
+							_assemblyName:{_assemblyName}
+							_namedSymbolsLookup:{_namedSymbolsLookup}
+							_dependencyObjectSymbol:{_dependencyObjectSymbol}
+							modules: {string.Join(", ", modules)}
+							modules: {string.Join(", ", modules)}
+
+							*/
+							""");
 
 						GenerateLinkerSubstitutionDefinition(bindableTypes, isApplication);
 					}

diff --git a/src/Uno.UI/DataBinding/BindingPropertyHelper.FastConvert.cs b/src/Uno.UI/DataBinding/BindingPropertyHelper.FastConvert.cs
@@ -350,7 +350,8 @@ private static bool FastStringConvert(Type outputType, string input, ref object
 
 		private static bool FastStringToIconElement(Type outputType, string input, ref object output)
 		{
-			if (outputType == typeof(Windows.UI.Xaml.Controls.IconElement))
+			if (__LinkerHints.Is_Windows_UI_Xaml_Controls_IconElement_Available
+				&& outputType == typeof(Windows.UI.Xaml.Controls.IconElement))
 			{
 				output = (Windows.UI.Xaml.Controls.IconElement)input;
 				return true;
@@ -427,7 +428,8 @@ private static bool FastStringToInputScope(Type outputType, string input, ref ob
 
 		private static bool FastStringToToolTip(Type outputType, string input, ref object output)
 		{
-			if (outputType == typeof(Windows.UI.Xaml.Controls.ToolTip))
+			if (__LinkerHints.Is_Windows_UI_Xaml_Controls_ToolTip_Available
+				&& outputType == typeof(Windows.UI.Xaml.Controls.ToolTip))
 			{
 				output = new Windows.UI.Xaml.Controls.ToolTip { Content = input };
 				return true;
@@ -509,7 +511,8 @@ private static bool FastStringToPointCollection(Type outputType, string input, r
 		private static bool FastStringToPath(Type outputType, string input, ref object output)
 		{
 #if __WASM__
-			if (outputType == typeof(Geometry))
+			if (__LinkerHints.Is_Windows_UI_Xaml_Media_Geometry_Available
+				&& outputType == typeof(Geometry))
 			{
 				output = (Geometry)input;
 
@@ -613,7 +616,8 @@ private static bool FastStringToColorConvert(Type outputType, string input, ref
 
 		private static bool FastStringToImageSource(Type outputType, string input, ref object output)
 		{
-			if (outputType == typeof(Windows.UI.Xaml.Media.ImageSource))
+			if (__LinkerHints.Is_Windows_UI_Xaml_Media_ImageSource_Available
+				&& outputType == typeof(Windows.UI.Xaml.Media.ImageSource))
 			{
 				output = (Windows.UI.Xaml.Media.ImageSource)input;
 				return true;

diff --git a/src/Uno.UI/FeatureConfiguration.cs b/src/Uno.UI/FeatureConfiguration.cs
@@ -419,9 +419,20 @@ public static class Style
 			/// </summary>
 			public static void ConfigureNativeFrameNavigation()
 			{
-				SetUWPDefaultStylesOverride<Frame>(useUWPDefaultStyle: false);
-				SetUWPDefaultStylesOverride<Windows.UI.Xaml.Controls.CommandBar>(useUWPDefaultStyle: false);
-				SetUWPDefaultStylesOverride<Windows.UI.Xaml.Controls.AppBarButton>(useUWPDefaultStyle: false);
+				if (__LinkerHints.Is_Windows_UI_Xaml_Controls_Frame_Available)
+				{
+					SetUWPDefaultStylesOverride<Frame>(useUWPDefaultStyle: false);
+				}
+
+				if (__LinkerHints.Is_Windows_UI_Xaml_Controls_CommandBar_Available)
+				{
+					SetUWPDefaultStylesOverride<Windows.UI.Xaml.Controls.CommandBar>(useUWPDefaultStyle: false);
+				}
+
+				if (__LinkerHints.Is_Windows_UI_Xaml_Controls_AppBarButton_Available)
+				{
+					SetUWPDefaultStylesOverride<Windows.UI.Xaml.Controls.AppBarButton>(useUWPDefaultStyle: false);
+				}
 			}
 
 			/// <summary>

diff --git a/src/Uno.UI/UI/Xaml/Automation/AutomationProperties.cs b/src/Uno.UI/UI/Xaml/Automation/AutomationProperties.cs
@@ -200,17 +200,35 @@ public static void SetAutomationId(DependencyObject element, string value)
 				new FrameworkPropertyMetadata(default(AutomationLandmarkType)));
 
 #if __WASM__
-		private static string FindHtmlRole(UIElement uIElement) =>
-			uIElement switch
+		private static string FindHtmlRole(UIElement uIElement)
+		{
+			if (__LinkerHints.Is_Windows_UI_Xaml_Controls_Button_Available && uIElement is Button)
+			{
+				return "button";
+			}
+			if (__LinkerHints.Is_Windows_UI_Xaml_Controls_RadioButton_Available && uIElement is RadioButton)
+			{
+				return "radio";
+			}
+			if (__LinkerHints.Is_Windows_UI_Xaml_Controls_CheckBox_Available && uIElement is CheckBox)
+			{
+				return "checkbox";
+			}
+			if (__LinkerHints.Is_Windows_UI_Xaml_Controls_TextBlock_Available && uIElement is TextBlock)
 			{
-				Button _ => "button",
-				RadioButton _ => "radio",
-				CheckBox _ => "checkbox",
-				TextBlock _ => "label",
-				TextBox _ => "textbox",
-				Slider _ => "slider",
-				_ => null
-			};
+				return "label";
+			}
+			if (__LinkerHints.Is_Windows_UI_Xaml_Controls_TextBox_Available && uIElement is TextBox)
+			{
+				return "textbox";
+			}
+			if (__LinkerHints.Is_Windows_UI_Xaml_Controls_Slider_Available && uIElement is Slider)
+			{
+				return "slider";
+			}
+
+			return null;
+		}
 #endif
 
 	}