Merge pull request #1155 from steffen-kiess/json-string

[mono.git] / mcs / class / System.Web / System.Web.UI.HtmlControls / HtmlHeadBuilder.cs

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlHeadBuilder.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlHeadBuilder.cs
index 26b689f263254772f99e912506b9fd4d576c30db..ab52926462b6a382d2595f4d4f03389fbf80321c 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlHeadBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlHeadBuilder.cs
@@ -4,8 +4,7 @@
 // Authors:
 //     Lluis Sanchez Gual (lluis@novell.com)
 //
-// (C) 2004 Novell, Inc.
-
+// Copyright (C) 2004-2010 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -27,14 +26,16 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
-using System.Web.UI;
 using System.Collections;
+using System.Globalization;
+using System.Security.Permissions;
 
 namespace System.Web.UI.HtmlControls
 {
-       class HtmlHeadBuilder : ControlBuilder
+       // CAS
+       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       public class HtmlHeadBuilder : ControlBuilder
        {
                public override bool AllowWhitespaceLiterals ()
                {
@@ -43,11 +44,14 @@ namespace System.Web.UI.HtmlControls
                
                public override Type GetChildControlType (string tagName, IDictionary attribs)
                {
-                       if (string.Compare (tagName, "TITLE", true) == 0)
-                               return typeof(HtmlTitle);
+                       if (String.Compare (tagName, "title", StringComparison.OrdinalIgnoreCase) == 0)
+                               return typeof (HtmlTitle);
+                       if (String.Compare (tagName, "link", StringComparison.OrdinalIgnoreCase) == 0)
+                               return typeof (HtmlLink);
+                       if (String.Compare (tagName, "meta", StringComparison.OrdinalIgnoreCase) == 0)
+                               return typeof (HtmlMeta);
                        return null;
                }
        }
 }
 
-#endif