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

@ -120,17 +120,17 @@ namespace System.Web.UI.WebControls
return true;
}
protected virtual void LoadViewState (object savedState)
protected virtual void LoadViewState (object state)
{
if (savedState is Pair) {
Pair p = (Pair) savedState;
if (state is Pair) {
Pair p = (Pair) state;
object[] akeys = (object[]) p.First;
object[] avals = (object[]) p.Second;
for (int n=0; n<akeys.Length; n++) {
keyTable [akeys[n]] = avals [n];
}
} else if (savedState is object[]) {
object[] avals = (object[]) savedState;
} else if (state is object[]) {
object[] avals = (object[]) state;
for (int n=0; n<avals.Length; n++)
keyTable [keyNames[n]] = avals [n];
}