Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@ -59,10 +59,10 @@ namespace System.Web.UI.WebControls
remove { Events.RemoveHandler (ActiveViewChangedEvent, value); }
}
protected override void AddParsedSubObject (object ob)
protected override void AddParsedSubObject (object obj)
{
if (ob is View)
Controls.Add (ob as View);
if (obj is View)
Controls.Add (obj as View);
// LAMESPEC: msdn talks that only View contorls are allowed, for others controls HttpException should be thrown
// but actually, aspx praser adds LiteralControl controls.
//else