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

@ -673,10 +673,10 @@ namespace System.Web.UI.WebControls {
registered_class = name;
}
public CssStyleCollection GetStyleAttributes (IUrlResolutionService resolver)
public CssStyleCollection GetStyleAttributes (IUrlResolutionService urlResolver)
{
CssStyleCollection col = new CssStyleCollection ();
FillStyleAttributes (col, resolver);
FillStyleAttributes (col, urlResolver);
return col;
}