Dispose of child renderers in FrameRenderer (#265)

* Dispose of child renderers in FrameRenderer

* Add missing null check
This commit is contained in:
E.Z. Hart 2016-08-02 14:57:08 -06:00 коммит произвёл Jason Smith
Родитель 34048b7bb4
Коммит 3f88aebe22
3 изменённых файлов: 169 добавлений и 2 удалений

Просмотреть файл

@ -0,0 +1,149 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using Xamarin.Forms.Controls.Issues;
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls
{
[Preserve (AllMembers = true)]
[Issue (IssueTracker.Bugzilla, 42329, "ListView in Frame and FormsAppCompatActivity Memory Leak")]
public class Bugzilla42329 : TestMasterDetailPage
{
const string DestructorMessage = "ContentPageEx Destructor called";
const string Page1Title = "Page1";
const string Page2Title = "Page2";
const string Page3Title = "Page3";
protected override void Init ()
{
var masterPage = new MasterPage();
Master = masterPage;
masterPage.ListView.ItemSelected += (sender, e) =>
{
var item = e.SelectedItem as MasterPageItem;
if (item != null)
{
Detail = new NavigationPage((Page)Activator.CreateInstance(item.TargetType));
masterPage.ListView.SelectedItem = null;
IsPresented = false;
}
};
Detail = new NavigationPage(new _42329_FrameWithListView());
}
[Preserve(AllMembers = true)]
public class MasterPage : ContentPage
{
public MasterPage()
{
Title = "Menu";
ListView = new ListView { VerticalOptions = LayoutOptions.FillAndExpand, SeparatorVisibility = SeparatorVisibility.None };
ListView.ItemTemplate = new DataTemplate(() =>
{
var ic = new ImageCell();
ic.SetBinding(TextCell.TextProperty, "Title");
return ic;
});
Content = new StackLayout
{
Children = { ListView }
};
var masterPageItems = new List<MasterPageItem>();
masterPageItems.Add(new MasterPageItem
{
Title = Page1Title,
TargetType = typeof(Bugzilla42329._42329_FrameWithListView)
});
masterPageItems.Add(new MasterPageItem
{
Title = Page2Title,
TargetType = typeof(Bugzilla42329._42329_Page2)
});
masterPageItems.Add(new MasterPageItem
{
Title = Page3Title,
TargetType = typeof(Bugzilla42329._42329_Page3)
});
ListView.ItemsSource = masterPageItems;
}
public ListView ListView { get; }
}
[Preserve(AllMembers = true)]
public class MasterPageItem
{
public string IconSource { get; set; }
public Type TargetType { get; set; }
public string Title { get; set; }
}
[Preserve(AllMembers = true)]
public class ContentPageEx : ContentPage
{
~ContentPageEx()
{
Log.Warning("Bugzilla42329", DestructorMessage);
}
}
[Preserve(AllMembers = true)]
public class _42329_FrameWithListView : ContentPageEx
{
public _42329_FrameWithListView()
{
var lv = new ListView();
var label = new Label();
var frame = new Frame { Content = lv };
Title = Page1Title;
Content = new StackLayout
{
Children = { new Label { Text = "Open the drawer menu and select Page2" }, frame }
};
}
}
[Preserve(AllMembers = true)]
public class _42329_Page2 : ContentPage
{
public _42329_Page2()
{
Title = Page2Title;
Content = new StackLayout { Children = { new Label { Text = "Open the drawer menu and select Page3" } } };
}
}
[Preserve(AllMembers = true)]
public class _42329_Page3 : ContentPage
{
public _42329_Page3()
{
Title = Page3Title;
Content = new StackLayout { Children = { new Label { Text = $"The console should have displayed the text '{DestructorMessage}' at least once. If not, this test has failed." } } };
}
protected override void OnAppearing()
{
base.OnAppearing();
GC.Collect();
GC.Collect();
GC.Collect();
}
}
}
}

Просмотреть файл

@ -117,6 +117,7 @@
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla42074.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla42075.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla42329.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CarouselAsync.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla34561.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla34727.cs" />

Просмотреть файл

@ -139,8 +139,19 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
_visualElementPackager = null;
}
int count = ChildCount;
for (var i = 0; i < count; i++)
{
AView child = GetChildAt(i);
child.Dispose();
}
if (Element != null)
{
Element.PropertyChanged -= OnElementPropertyChanged;
UnsubscribeGestureRecognizers(Element);
}
}
base.Dispose(disposing);
@ -216,8 +227,11 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
_collectionChangeHandler = HandleGestureRecognizerCollectionChanged;
var observableCollection = (ObservableCollection<IGestureRecognizer>)view.GestureRecognizers;
if (observableCollection != null)
{
observableCollection.CollectionChanged += _collectionChangeHandler;
}
}
void UnsubscribeGestureRecognizers(VisualElement element)
{
@ -226,8 +240,11 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
return;
var observableCollection = (ObservableCollection<IGestureRecognizer>)view.GestureRecognizers;
if (observableCollection != null)
{
observableCollection.CollectionChanged -= _collectionChangeHandler;
}
}
void UpdateBackgroundColor()
{