Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs

@@ -164,12 +164,7 @@ namespace System.Web.UI.HtmlControls {
 			} else {
 				string hr = HRef;
 				if (hr != string.Empty)
-#if TARGET_J2EE
-					// For J2EE portlets we need to genreate a render URL.
-					HRef = ResolveClientUrl (hr, String.Compare (Target, "_blank", StringComparison.InvariantCultureIgnoreCase) != 0);
-#else
 					HRef = ResolveClientUrl (hr);
-#endif
 			}
 
 			base.RenderAttributes (writer);

mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs

@@ -203,31 +203,12 @@ namespace System.Web.UI.HtmlControls
 
 		internal bool DetermineRenderUplevel ()
 		{
-#if TARGET_J2EE
-			if (HttpContext.Current == null)
-				return false;
-
-			return (
-				/* From someplace on the web: "JavaScript 1.2
-				 * and later (also known as ECMAScript) has
-				 * built-in support for regular
-				 * expressions" */
-				((Page.Request.Browser.EcmaScriptVersion.Major == 1
-				  && Page.Request.Browser.EcmaScriptVersion.Minor >= 2)
-				 || (Page.Request.Browser.EcmaScriptVersion.Major > 1))
-
-				/* document.getElementById, .getAttribute,
-				 * etc, are all DOM level 1.  I don't think we
-				 * use anything in level 2.. */
-				&& Page.Request.Browser.W3CDomVersion.Major >= 1);
-#else
 			if (isUplevel != null)
 				return (bool) isUplevel;
 			
 			isUplevel = UplevelHelper.IsUplevel (
 				System.Web.Configuration.HttpCapabilitiesBase.GetUserAgentForDetection (HttpContext.Current.Request));
 			return (bool) isUplevel;
-#endif
 		}
 
 		protected internal override void OnPreRender (EventArgs e)
@@ -244,7 +225,6 @@ namespace System.Web.UI.HtmlControls
 			string customAction = Attributes ["action"];
 			Page page = Page;
 			HttpRequest req = page != null ? page.RequestInternal : null;
-#if !TARGET_J2EE
 			if (String.IsNullOrEmpty (customAction)) {
 				string file_path = req != null ? req.ClientFilePath : null;
 				string current_path = req != null ? req.CurrentExecutionFilePath : null;
@@ -282,23 +262,10 @@ namespace System.Web.UI.HtmlControls
 				action = customAction;
 			if (req != null)
 				action += req.QueryStringRaw;
-#else
-			// Allow the page to transform action to a portlet action url
-			if (String.IsNullOrEmpty (customAction)) {
-				string queryString = req.QueryStringRaw;
-				action = CreateActionUrl (VirtualPathUtility.ToAppRelative (req.CurrentExecutionFilePath) +
-					(string.IsNullOrEmpty (queryString) ? string.Empty : "?" + queryString));
-			}
-			else
-				action = customAction;
-
-#endif
 			if (req != null) {
 				XhtmlConformanceSection xhtml = WebConfigurationManager.GetSection ("system.web/xhtmlConformance") as XhtmlConformanceSection;
 				if (xhtml == null || xhtml.Mode != XhtmlConformanceMode.Strict)
-#if NET_4_0
 					if (RenderingCompatibilityLessThan40)
-#endif
 						// LAMESPEC: MSDN says the 'name' attribute is rendered only in
 						// Legacy mode, this is not true.
 						w.WriteAttribute ("name", Name);

mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlHead.cs

@@ -39,12 +39,10 @@ namespace System.Web.UI.HtmlControls
 	[ControlBuilder (typeof(HtmlHeadBuilder))]
 	public sealed class HtmlHead: HtmlGenericControl, IParserAccessor
 	{
-#if NET_4_0
 		string descriptionText;
 		string keywordsText;
 		HtmlMeta descriptionMeta;
 		HtmlMeta keywordsMeta;
-#endif
 		string titleText;
 		HtmlTitle title;
 		//Hashtable metadata;
@@ -79,7 +77,6 @@ namespace System.Web.UI.HtmlControls
 					writer.Write (titleText);
 				writer.RenderEndTag ();
 			}
-#if NET_4_0
 			if (descriptionMeta == null && descriptionText != null) {
 				writer.AddAttribute ("name", "description");
 				writer.AddAttribute ("content", HttpUtility.HtmlAttributeEncode (descriptionText));
@@ -93,7 +90,6 @@ namespace System.Web.UI.HtmlControls
 				writer.RenderBeginTag (HtmlTextWriterTag.Meta);
 				writer.RenderEndTag ();
 			}
-#endif
 			if (styleSheet != null)
 				styleSheet.Render (writer);
 		}
@@ -108,7 +104,6 @@ namespace System.Web.UI.HtmlControls
 				title = t;
 			}
 
-#if NET_4_0
 			HtmlMeta meta = control as HtmlMeta;
 			if (meta != null) {
 				if (String.Compare ("keywords", meta.Name, StringComparison.OrdinalIgnoreCase) == 0)
@@ -116,7 +111,6 @@ namespace System.Web.UI.HtmlControls
 				else if (String.Compare ("description", meta.Name, StringComparison.OrdinalIgnoreCase) == 0)
 					descriptionMeta = meta;
 			}
-#endif
 			base.AddedControl (control, index);
 		}
 
@@ -125,15 +119,12 @@ namespace System.Web.UI.HtmlControls
 			if (title == control)
 				title = null;
 
-#if NET_4_0
 			if (keywordsMeta == control)
 				keywordsMeta = null;
 			else if (descriptionMeta == control)
 				descriptionMeta = null;
-#endif
 			base.RemovedControl (control);
 		}
-#if NET_4_0
 		public string Description {
 			get {
 				if (descriptionMeta != null)
@@ -163,7 +154,6 @@ namespace System.Web.UI.HtmlControls
 					keywordsText = value;
 			}
 		}
-#endif
 		
 		public IStyleSheet StyleSheet {
 			get {