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

@ -101,47 +101,47 @@ namespace System.ComponentModel.Design.Serialization
}
public virtual CodeStatementCollection SerializeMember (IDesignerSerializationManager manager,
object owningobject, MemberDescriptor member)
object owningObject, MemberDescriptor member)
{
if (member == null)
throw new ArgumentNullException ("member");
if (owningobject == null)
throw new ArgumentNullException ("owningobject");
if (owningObject == null)
throw new ArgumentNullException ("owningObject");
if (manager == null)
throw new ArgumentNullException ("manager");
CodeStatementCollection statements = new CodeStatementCollection ();
CodeExpression expression = base.GetExpression (manager, owningobject);
CodeExpression expression = base.GetExpression (manager, owningObject);
if (expression == null) {
string name = manager.GetName (owningobject);
string name = manager.GetName (owningObject);
if (name == null)
name = base.GetUniqueName (manager, owningobject);
name = base.GetUniqueName (manager, owningObject);
expression = new CodeVariableReferenceExpression (name);
base.SetExpression (manager, owningobject, expression);
base.SetExpression (manager, owningObject, expression);
}
if (member is PropertyDescriptor)
base.SerializeProperty (manager, statements, owningobject, (PropertyDescriptor) member);
base.SerializeProperty (manager, statements, owningObject, (PropertyDescriptor) member);
if (member is EventDescriptor)
base.SerializeEvent (manager, statements, owningobject, (EventDescriptor) member);
base.SerializeEvent (manager, statements, owningObject, (EventDescriptor) member);
return statements;
}
public virtual CodeStatementCollection SerializeMemberAbsolute (IDesignerSerializationManager manager,
object owningobject, MemberDescriptor member)
object owningObject, MemberDescriptor member)
{
if (member == null)
throw new ArgumentNullException ("member");
if (owningobject == null)
throw new ArgumentNullException ("owningobject");
if (owningObject == null)
throw new ArgumentNullException ("owningObject");
if (manager == null)
throw new ArgumentNullException ("manager");
SerializeAbsoluteContext context = new SerializeAbsoluteContext (member);
manager.Context.Push (context);
CodeStatementCollection result = this.SerializeMember (manager, owningobject, member);
CodeStatementCollection result = this.SerializeMember (manager, owningObject, member);
manager.Context.Pop ();
return result;
}