Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -139,7 +139,9 @@ namespace System.Web.UI {
RegisterTag("big", HtmlTextWriterTag.Big, TagType.Inline);
RegisterTag("blockquote", HtmlTextWriterTag.Blockquote, TagType.Other);
RegisterTag("body", HtmlTextWriterTag.Body, TagType.Other);
RegisterTag("br", HtmlTextWriterTag.Br, TagType.Other);
// Devdiv 852940, BR is a self-closing tag
RegisterTag("br", HtmlTextWriterTag.Br,
BinaryCompatibility.Current.TargetsAtLeastFramework46 ? TagType.NonClosing : TagType.Other);
RegisterTag("button", HtmlTextWriterTag.Button, TagType.Inline);
RegisterTag("caption", HtmlTextWriterTag.Caption, TagType.Other);
RegisterTag("center", HtmlTextWriterTag.Center, TagType.Other);
@@ -373,7 +375,6 @@ namespace System.Web.UI {
}
//Writes a string to the text stream.
[System.Runtime.TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")]
public override void Write(string s) {
if (tabsPending) {
OutputTabs();
@@ -390,7 +391,6 @@ namespace System.Web.UI {
}
//Writes a character to the text stream.
[System.Runtime.TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")]
public override void Write(char value) {
if (tabsPending) {
OutputTabs();
@@ -1128,22 +1128,18 @@ namespace System.Web.UI {
}
}
[System.Runtime.TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")]
protected virtual string RenderBeforeTag() {
return null;
}
[System.Runtime.TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")]
protected virtual string RenderBeforeContent() {
return null;
}
[System.Runtime.TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")]
protected virtual string RenderAfterContent() {
return null;
}
[System.Runtime.TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")]
protected virtual string RenderAfterTag() {
return null;
}