From: <asa...@us...> - 2012-12-09 07:25:39
|
Revision: 7843 http://sourceforge.net/p/htmlunit/code/7843 Author: asashour Date: 2012-12-09 07:25:36 +0000 (Sun, 09 Dec 2012) Log Message: ----------- BrowserVersion: deprecated CHROME_16, and add CHROME Modified Paths: -------------- trunk/htmlunit/src/changes/changes.xml trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionClassRunner.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NodeFilterTest.java Modified: trunk/htmlunit/src/changes/changes.xml =================================================================== --- trunk/htmlunit/src/changes/changes.xml 2012-12-08 16:51:50 UTC (rev 7842) +++ trunk/htmlunit/src/changes/changes.xml 2012-12-09 07:25:36 UTC (rev 7843) @@ -9,9 +9,9 @@ <body> <release version="2.12" date="???" description="Bugfixes"> <action type="update" dev="asashour"> - BrowserVersion: deprecate INTERNET_EXPLORER_6, INTERNET_EXPLORER_7, FIREFOX_10, - and make INTERNET_EXPLORER_8 the default one. Add INTERNET_EXPLORER_9 and - FIREFOX_17. + BrowserVersion: deprecate INTERNET_EXPLORER_6, INTERNET_EXPLORER_7, FIREFOX_10, CHROME_16, + and make INTERNET_EXPLORER_8 the default one. Add INTERNET_EXPLORER_9, + FIREFOX_17 and CHROME. </action> <action type="fix" dev="asashour" issue="1467"> JavaScript: fix Date.toLocaleDateString(). Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2012-12-08 16:51:50 UTC (rev 7842) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2012-12-09 07:25:36 UTC (rev 7843) @@ -160,7 +160,11 @@ INTERNET_EXPLORER, "5.0 (compatible; MSIE 9.0; Windows NT 6.1)", "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1)", 9, "IE9", null); - /** Chrome 16. Warning: highly experimental!!! */ + /** + * Chrome 16. + * @deprecated as of 2.12 + */ + @Deprecated public static final BrowserVersion CHROME_16 = new BrowserVersion( "Netscape", "5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/535.7" + " (KHTML, like Gecko) Chrome/16.0.912.63 Safari/535.7", @@ -168,6 +172,14 @@ + " (KHTML, like Gecko) Chrome/16.0.912.63 Safari/535.7", 16, "Chrome16", null); + /** Latest Chrome. Work In Progress!!! */ + public static final BrowserVersion CHROME = new BrowserVersion( + "Netscape", "5.0 (Windows NT 6.1) AppleWebKit/537.11" + + " (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11", + "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.11" + + " (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11", + 23, "Chrome", null); + /** The default browser version. */ private static BrowserVersion DefaultBrowserVersion_ = INTERNET_EXPLORER_8; @@ -195,6 +207,11 @@ CHROME_16.setPlatform("MacIntel"); CHROME_16.setCpuClass(null); CHROME_16.setBrowserLanguage("undefined"); + CHROME.initDefaultFeatures(); + CHROME.setApplicationCodeName("Mozilla"); + CHROME.setPlatform("MacIntel"); + CHROME.setCpuClass(null); + CHROME.setBrowserLanguage("undefined"); // there are other issues with Chrome; a different productSub, etc. } |