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

@ -1299,13 +1299,13 @@ namespace System.Web.UI.WebControls
throw new NotImplementedException ();
}
protected internal override void LoadControlState (object ob)
protected internal override void LoadControlState (object state)
{
if (ob == null) return;
object[] state = (object[]) ob;
base.LoadControlState (state[0]);
activeStepIndex = (int) state[1];
history = (ArrayList) state[2];
if (state == null) return;
object[] controlState = (object[]) state;
base.LoadControlState (controlState[0]);
activeStepIndex = (int) controlState[1];
history = (ArrayList) controlState[2];
}
protected internal override object SaveControlState ()