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

@ -73,9 +73,9 @@ namespace System.ComponentModel.Design
{
}
public DesignSurfaceManager (IServiceProvider serviceProvider)
public DesignSurfaceManager (IServiceProvider parentProvider)
{
_parentProvider = serviceProvider;
_parentProvider = parentProvider;
this.ServiceContainer.AddService (typeof (IDesignerEventService), new DesignerEventService ());
}
@ -224,10 +224,10 @@ namespace System.ComponentModel.Design
}
public object GetService (Type service)
public object GetService (Type serviceType)
{
if (_serviceContainer != null)
return _serviceContainer.GetService (service);
return _serviceContainer.GetService (serviceType);
return null;
}