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

@ -827,12 +827,12 @@ namespace System.Web.UI.WebControls
return null;
}
protected override void LoadViewState (object savedState)
protected override void LoadViewState (object state)
{
if (savedState == null)
if (state == null)
return;
object [] states = (object []) savedState;
object [] states = (object []) state;
base.LoadViewState (states[0]);
if (states[1] != null)
@ -921,9 +921,9 @@ namespace System.Web.UI.WebControls
}
string callbackResult;
protected virtual void RaiseCallbackEvent (string eventArgs)
protected virtual void RaiseCallbackEvent (string eventArgument)
{
string[] args = eventArgs.Split ('|');
string[] args = eventArgument.Split ('|');
RequiresDataBinding = true;
EnsureDataBound ();