Menu
▾
▴
[HtmlUnit] SVN: [15292] trunk/htmlunit/src
|
From: <rb...@us...> - 2018-05-27 11:29:32
|
Revision: 15292
http://sourceforge.net/p/htmlunit/code/15292
Author: rbri
Date: 2018-05-27 11:29:11 +0000 (Sun, 27 May 2018)
Log Message:
-----------
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/CodeStyleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/NotYetImplementedTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementDefaultStyleDisplayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/DebugFrameImplTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/configuration/JavaScriptConfigurationTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/History2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MapTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NamedNodeMapTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SetTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SymbolTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/URLSearchParamsTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowConcurrencyTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/ArrayBufferTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Float64ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int16ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Int8ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint16ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint32ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/arrays/Uint8ClampedArrayTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSKeyframesRuleTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSRuleListTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributesIterableTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementClientWidthTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetWidthTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMParserTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMTokenListTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTypeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeListTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/PopStateEventTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/WebGLContextEventTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/file/FileTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLCanvasElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxy3Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/runners/BrowserStatement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/runners/BrowserVersionClassRunner.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/runners/TestCaseCorrector.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/svg/SvgAltGlyphTest.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/changes/changes.xml 2018-05-27 11:29:11 UTC (rev 15292)
@@ -7,7 +7,7 @@
</properties>
<body>
- <release version="2.32" date="xx 2018" description="Bugfixes">
+ <release version="2.32" date="xx 2018" description="Bugfixes, FIREFOX_45 removed, FIREFOX_60 added">
<action type="fix" dev="rbri" issue="1962">
Various fixes for the selector specificity calculation (CssParser).
</action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -93,12 +93,10 @@
private static final String PLATFORM_WIN64 = "Win64";
/**
- * Firefox 45 ESR.
- * @since 2.21
- * @deprecated As of 2.31
+ * Firefox 60 ESR.
+ * @since 2,.32
*/
- @Deprecated
- public static final BrowserVersion FIREFOX_45 = new BrowserVersion(45, "FF45");
+ public static final BrowserVersion FIREFOX_60 = new BrowserVersion(45, "FF60");
/**
* Firefox 52 ESR.
@@ -125,13 +123,13 @@
/** Register plugins for the browser versions. */
static {
- // FF45
- FIREFOX_45.applicationVersion_ = "5.0 (Windows)";
- FIREFOX_45.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0";
- FIREFOX_45.platform_ = PLATFORM_WIN32;
- FIREFOX_45.buildId_ = "20170411115307";
- FIREFOX_45.productSub_ = "20100101";
- FIREFOX_45.headerNamesOrdered_ = new String[] {
+ // FF60
+ FIREFOX_60.applicationVersion_ = "5.0 (Windows)";
+ FIREFOX_60.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0";
+ FIREFOX_60.platform_ = PLATFORM_WIN32;
+ FIREFOX_60.buildId_ = "20170411115307";
+ FIREFOX_60.productSub_ = "20100101";
+ FIREFOX_60.headerNamesOrdered_ = new String[] {
HttpHeader.HOST,
HttpHeader.USER_AGENT,
HttpHeader.ACCEPT,
@@ -140,11 +138,11 @@
HttpHeader.REFERER,
HttpHeader.COOKIE,
HttpHeader.CONNECTION};
- FIREFOX_45.htmlAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
- FIREFOX_45.xmlHttpRequestAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
- FIREFOX_45.imgAcceptHeader_ = "image/png,image/*;q=0.8,*/*;q=0.5";
- FIREFOX_45.cssAcceptHeader_ = "text/css,*/*;q=0.1";
- FIREFOX_45.fontHeights_ = new int[] {
+ FIREFOX_60.htmlAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
+ FIREFOX_60.xmlHttpRequestAcceptHeader_ = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
+ FIREFOX_60.imgAcceptHeader_ = "image/png,image/*;q=0.8,*/*;q=0.5";
+ FIREFOX_60.cssAcceptHeader_ = "text/css,*/*;q=0.1";
+ FIREFOX_60.fontHeights_ = new int[] {
0, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
30, 31, 32, 33, 34, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45, 46, 47, 48, 50, 51, 52, 53, 53, 55, 57, 58,
59, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 72, 73, 74, 75, 76, 77, 78, 79, 80, 82, 84, 85, 86, 87, 88,
@@ -271,29 +269,29 @@
CHROME.registerUploadMimeType("txt", "text/plain");
CHROME.registerUploadMimeType("text", "text/plain");
- FIREFOX_45.registerUploadMimeType("html", "text/html");
- FIREFOX_45.registerUploadMimeType("htm", "text/html");
- FIREFOX_45.registerUploadMimeType("css", "text/css");
- FIREFOX_45.registerUploadMimeType("xml", "text/xml");
- FIREFOX_45.registerUploadMimeType("gif", "image/gif");
- FIREFOX_45.registerUploadMimeType("jpeg", "image/jpeg");
- FIREFOX_45.registerUploadMimeType("jpg", "image/jpeg");
- FIREFOX_45.registerUploadMimeType("mp4", "video/mp4");
- FIREFOX_45.registerUploadMimeType("m4v", "video/mp4");
- FIREFOX_45.registerUploadMimeType("m4a", "audio/mp4");
- FIREFOX_45.registerUploadMimeType("mp3", "audio/mpeg");
- FIREFOX_45.registerUploadMimeType("ogv", "video/ogg");
- FIREFOX_45.registerUploadMimeType("ogm", "video/x-ogm");
- FIREFOX_45.registerUploadMimeType("ogg", "video/ogg");
- FIREFOX_45.registerUploadMimeType("oga", "audio/ogg");
- FIREFOX_45.registerUploadMimeType("opus", "audio/ogg");
- FIREFOX_45.registerUploadMimeType("webm", "video/webm");
- FIREFOX_45.registerUploadMimeType("wav", "audio/wav");
- FIREFOX_45.registerUploadMimeType("flac", "audio/x-flac");
- FIREFOX_45.registerUploadMimeType("xhtml", "application/xhtml+xml");
- FIREFOX_45.registerUploadMimeType("xht", "application/xhtml+xml");
- FIREFOX_45.registerUploadMimeType("txt", "text/plain");
- FIREFOX_45.registerUploadMimeType("text", "text/plain");
+ FIREFOX_60.registerUploadMimeType("html", "text/html");
+ FIREFOX_60.registerUploadMimeType("htm", "text/html");
+ FIREFOX_60.registerUploadMimeType("css", "text/css");
+ FIREFOX_60.registerUploadMimeType("xml", "text/xml");
+ FIREFOX_60.registerUploadMimeType("gif", "image/gif");
+ FIREFOX_60.registerUploadMimeType("jpeg", "image/jpeg");
+ FIREFOX_60.registerUploadMimeType("jpg", "image/jpeg");
+ FIREFOX_60.registerUploadMimeType("mp4", "video/mp4");
+ FIREFOX_60.registerUploadMimeType("m4v", "video/mp4");
+ FIREFOX_60.registerUploadMimeType("m4a", "audio/mp4");
+ FIREFOX_60.registerUploadMimeType("mp3", "audio/mpeg");
+ FIREFOX_60.registerUploadMimeType("ogv", "video/ogg");
+ FIREFOX_60.registerUploadMimeType("ogm", "video/x-ogm");
+ FIREFOX_60.registerUploadMimeType("ogg", "video/ogg");
+ FIREFOX_60.registerUploadMimeType("oga", "audio/ogg");
+ FIREFOX_60.registerUploadMimeType("opus", "audio/ogg");
+ FIREFOX_60.registerUploadMimeType("webm", "video/webm");
+ FIREFOX_60.registerUploadMimeType("wav", "audio/wav");
+ FIREFOX_60.registerUploadMimeType("flac", "audio/x-flac");
+ FIREFOX_60.registerUploadMimeType("xhtml", "application/xhtml+xml");
+ FIREFOX_60.registerUploadMimeType("xht", "application/xhtml+xml");
+ FIREFOX_60.registerUploadMimeType("txt", "text/plain");
+ FIREFOX_60.registerUploadMimeType("text", "text/plain");
FIREFOX_52.registerUploadMimeType("html", "text/html");
FIREFOX_52.registerUploadMimeType("htm", "text/html");
@@ -359,7 +357,7 @@
"Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF32_29_0_0_140.dll");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
- FIREFOX_45.plugins_.add(flash);
+ FIREFOX_60.plugins_.add(flash);
flash = new PluginConfiguration("Shockwave Flash",
"Shockwave Flash 29.0 r0", "29.0.0.140", "NPSWF64_29_0_0_140.dll");
@@ -442,7 +440,7 @@
expectedBrowser = SupportedBrowser.FF52;
}
else if (isFirefox()) {
- expectedBrowser = SupportedBrowser.FF45;
+ expectedBrowser = SupportedBrowser.FF60;
}
else if (isIE()) {
expectedBrowser = SupportedBrowser.IE;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -51,7 +51,7 @@
ANCHOR_IGNORE_TARGET_FOR_JS_HREF,
/** Is the default display style of Applet is 'inline-block'. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
APPLET_INLINE_BLOCK,
/** Background image is 'initial'. */
@@ -433,7 +433,7 @@
HTMLLINK_CHECK_TYPE_FOR_STYLESHEET,
/** If the single select has exact one option, this options gets never deselected. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
HTMLOPTION_EXACT_ONE_OPTION_GETS_NERVER_DESELECTED,
/** */
@@ -608,7 +608,7 @@
JS_CANVAS_DATA_URL_IE_PNG,
/** draw for canvas throws an error if no image available. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
JS_CANVAS_DRAW_THROWS_FOR_MISSING_IMG,
/** Do not allow invalid clear values. */
@@ -644,7 +644,7 @@
JS_CSSRULELIST_ENUM_ITEM_LENGTH,
/** Uses {@code MozCSSKeyframesRule}. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
JS_CSS_MOZ_CSS_KEYFRAMES_RULE,
/** <code>Date.toLocaleDateString()</code> returns a short form (d.M.yyyy). */
@@ -1235,9 +1235,9 @@
@BrowserFeature({CHROME, FF, EDGE})
JS_SYMBOL,
- /** Symbol support is limited in FF45. */
- @BrowserFeature(FF45)
- JS_SYMBOL_FF45,
+ /** Symbol support is limited in FF60. */
+ @BrowserFeature(FF60)
+ JS_SYMBOL_FF60,
/** The width cell height does not return negative values. */
@BrowserFeature(IE)
@@ -1290,7 +1290,7 @@
/** Setting the property cols throws an exception, if the provided value is not convertible into an integer.
* FF ignores the provided value in this case and sets cols to 0.
*/
- @BrowserFeature({IE, FF45})
+ @BrowserFeature({IE, FF60})
JS_TEXT_AREA_SET_COLS_THROWS_EXCEPTION,
/** Setting the property {@code maxLength} throws an exception, if the provided value is less than 0. */
@@ -1304,7 +1304,7 @@
/** Setting the property rows throws an exception, if the provided value is not convertible into an integer.
* FF ignores the provided value in this case and sets rows to 0.
*/
- @BrowserFeature({IE, FF45})
+ @BrowserFeature({IE, FF60})
JS_TEXT_AREA_SET_ROWS_THROWS_EXCEPTION,
/** Setting the value processes null as null value. */
@@ -1489,7 +1489,7 @@
SLOT_CONTENTS,
/** Indicates that string.contains() is supported. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
STRING_CONTAINS,
/** Indicates that string.includes() is supported. */
@@ -1541,7 +1541,7 @@
* Indicates, that the pathname for the url {@code about:blank} is empty;
* instead of '/blank'.
*/
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
URL_ABOUT_BLANK_HAS_EMPTY_PATH,
/**
@@ -1581,7 +1581,7 @@
XHR_IGNORE_PORT_FOR_SAME_ORIGIN,
/** ProgressEvent.lengthComputable is true. */
- @BrowserFeature({FF45, IE})
+ @BrowserFeature({FF60, IE})
XHR_LENGTH_COMPUTABLE,
/** A cross origin request to {@code about:blank} is not allowed. */
@@ -1593,7 +1593,7 @@
XHR_OPEN_ALLOW_EMTPY_URL,
/** Indicates that open() throws an exception in sync mode if 'withCredentials' is set to true. */
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
XHR_OPEN_WITHCREDENTIALS_TRUE_IN_SYNC_EXCEPTION,
/** Indicates that method overrideMimeType throws if msg was already sent. */
@@ -1616,7 +1616,7 @@
* Indicates that the property <code>withCredentials</code> is not writable for sync requests.
* Setting the property throws an exception.
*/
- @BrowserFeature(FF45)
+ @BrowserFeature(FF60)
XHR_WITHCREDENTIALS_NOT_WRITEABLE_IN_SYNC_EXCEPTION,
/** Indicates that the XPath attribute is case sensitive. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -23,7 +23,7 @@
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_OBJECT_GET_OWN_PROPERTY_SYMBOLS;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_REFLECT;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL;
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL_FF45;
+import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_SYMBOL_FF60;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_WINDOW_ACTIVEXOBJECT_HIDDEN;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_XML;
import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STRING_CONTAINS;
@@ -232,7 +232,7 @@
deleteProperties(window, "Symbol");
}
- if (browserVersion.hasFeature(JS_SYMBOL_FF45)) {
+ if (browserVersion.hasFeature(JS_SYMBOL_FF60)) {
final ScriptableObject sym = (ScriptableObject) ScriptableObject.getProperty(window, "Symbol");
final List<String> toDelete = Arrays.asList("hasInstance", "isConcatSpreadable", "replace",
"search", "split", "string", "toStringTag", "unscopables");
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -115,7 +115,7 @@
expectedBrowser = FF52;
}
else if (browser.isFirefox()) {
- expectedBrowser = FF45;
+ expectedBrowser = FF60;
}
else {
expectedBrowser = CHROME; // our current fallback
@@ -330,8 +330,8 @@
*/
public static boolean isCompatible(final SupportedBrowser browser1, final SupportedBrowser browser2) {
return (browser1 == browser2)
- || (browser1 == FF && (browser2 == FF45 || browser2 == FF52))
- || (browser2 == FF && (browser1 == FF45 || browser1 == FF52));
+ || (browser1 == FF && (browser2 == FF60 || browser2 == FF52))
+ || (browser2 == FF && (browser1 == FF60 || browser1 == FF52));
}
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/configuration/SupportedBrowser.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -34,7 +34,7 @@
FF,
/** Firefox 45. */
- FF45,
+ FF60,
/** Firefox 52. */
FF52
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -24,7 +24,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -2650,7 +2650,7 @@
* Returns the {@code onmozpointerlockchange} event handler.
* @return the {@code onmozpointerlockchange} event handler
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockchange() {
return getEventHandler("mozpointerlockchange");
}
@@ -2659,7 +2659,7 @@
* Sets the {@code onmozpointerlockchange} event handler.
* @param onmozpointerlockchange the {@code onmozpointerlockchange} event handler
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockchange(final Object onmozpointerlockchange) {
setHandlerForJavaScript("mozpointerlockchange", onmozpointerlockchange);
}
@@ -4054,7 +4054,7 @@
* Returns the {@code onmozpointerlockerror} event handler.
* @return the {@code onmozpointerlockerror} event handler
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockerror() {
return getEventHandler("mozpointerlockerror");
}
@@ -4063,7 +4063,7 @@
* Sets the {@code onmozpointerlockerror} event handler.
* @param onmozpointerlockerror the {@code onmozpointerlockerror} event handler
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockerror(final Object onmozpointerlockerror) {
setHandlerForJavaScript("mozpointerlockerror", onmozpointerlockerror);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGL2RenderingContext.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.canvas;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -1645,7 +1645,7 @@
public static final long STENCIL_FUNC = 2962L;
/** The constant {@code STENCIL_INDEX}. */
- @JsxConstant({FF52, FF45, IE})
+ @JsxConstant({FF52, FF60, IE})
public static final long STENCIL_INDEX = 6401L;
/** The constant {@code STENCIL_INDEX8}. */
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/WebGLRenderingContext.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -340,7 +340,7 @@
@JsxConstant
public static final int TEXTURE = 0x1702;
/** The constant {@code STENCIL_INDEX}. */
- @JsxConstant({FF52, FF45, IE})
+ @JsxConstant({FF52, FF60, IE})
public static final int STENCIL_INDEX = 0x1901;
/** The constant {@code DEPTH_COMPONENT}. */
@JsxConstant
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -1066,7 +1066,7 @@
if (browserVersion.hasFeature(JS_CLIENTWIDTH_INPUT_TEXT_169)) {
return 169;
}
- width = 141; // FF45
+ width = 141; // FF60
}
else if (node instanceof HtmlRadioButtonInput || node instanceof HtmlCheckBoxInput) {
width = 13;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/MozCSSKeyframesRule.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.css;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -23,6 +23,6 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(FF45)
+@JsxClass(FF60)
public class MozCSSKeyframesRule extends CSSRule {
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMSettableTokenList.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -16,7 +16,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -27,7 +27,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass({FF45, IE, EDGE})
+@JsxClass({FF60, IE, EDGE})
public class DOMSettableTokenList extends DOMTokenList {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Document.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -34,7 +34,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import static com.gargoylesoftware.htmlunit.util.StringUtils.parseHttpDate;
@@ -3563,7 +3563,7 @@
* Returns the {@code onmozpointerlockchange} event handler for this element.
* @return the {@code onmozpointerlockchange} event handler for this element
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockchange() {
return getEventHandler("mozpointerlockchange");
}
@@ -3572,7 +3572,7 @@
* Sets the {@code onmozpointerlockchange} event handler for this element.
* @param onmozpointerlockchange the {@code onmozpointerlockchange} event handler for this element
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockchange(final Object onmozpointerlockchange) {
setEventHandler("mozpointerlockchange", onmozpointerlockchange);
}
@@ -3581,7 +3581,7 @@
* Returns the {@code onmozpointerlockerror} event handler for this element.
* @return the {@code onmozpointerlockerror} event handler for this element
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockerror() {
return getEventHandler("mozpointerlockerror");
}
@@ -3590,7 +3590,7 @@
* Sets the {@code onmozpointerlockerror} event handler for this element.
* @param onmozpointerlockerror the {@code onmozpointerlockerror} event handler for this element
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockerror(final Object onmozpointerlockerror) {
setEventHandler("mozpointerlockerror", onmozpointerlockerror);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentType.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -19,7 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
import org.apache.commons.lang3.StringUtils;
@@ -141,7 +141,7 @@
* {@inheritDoc}
*/
@Override
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Object getPrefix() {
return super.getPrefix();
}
@@ -150,7 +150,7 @@
* {@inheritDoc}
*/
@Override
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Object getLocalName() {
return super.getLocalName();
}
@@ -159,7 +159,7 @@
* {@inheritDoc}
*/
@Override
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Object getNamespaceURI() {
return super.getNamespaceURI();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/dom/Node.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -19,7 +19,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -721,7 +721,7 @@
* Returns the namespace prefix.
* @return the namespace prefix
*/
- @JsxGetter({FF45, IE})
+ @JsxGetter({FF60, IE})
public Object getPrefix() {
return getDomNodeOrDie().getPrefix();
}
@@ -730,7 +730,7 @@
* Returns the local name of this attribute.
* @return the local name of this attribute
*/
- @JsxGetter({FF45, IE})
+ @JsxGetter({FF60, IE})
public Object getLocalName() {
return getDomNodeOrDie().getLocalName();
}
@@ -739,7 +739,7 @@
* Returns the URI that identifies an XML namespace.
* @return the URI that identifies an XML namespace
*/
- @JsxGetter({FF45, IE})
+ @JsxGetter({FF60, IE})
public Object getNamespaceURI() {
return getDomNodeOrDie().getNamespaceURI();
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozContactChangeEvent.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.event;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -24,7 +24,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(FF45)
+@JsxClass(FF60)
public class MozContactChangeEvent extends Event {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/event/MozSettingsEvent.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.event;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -24,7 +24,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(FF45)
+@JsxClass(FF60)
public class MozSettingsEvent extends Event {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -147,7 +147,7 @@
LOG.info("Invoking URL: " + url);
}
- try (WebClient webClient = new WebClient(BrowserVersion.FIREFOX_45)) {
+ try (WebClient webClient = new WebClient(BrowserVersion.FIREFOX_60)) {
final Page page = webClient.getPage(url);
final String content = page.getWebResponse().getContentAsString();
if (LOG.isDebugEnabled()) {
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLContentElement.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.html;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.html.HtmlContent;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -26,7 +26,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(domClass = HtmlContent.class, value = {CHROME, FF45})
+@JsxClass(domClass = HtmlContent.class, value = {CHROME, FF60})
public class HTMLContentElement extends HTMLElement {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -23,7 +23,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -173,7 +173,7 @@
@JsxClass(domClass = HtmlDefinitionTerm.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlElement.class, value = {FF, IE})
@JsxClass(domClass = HtmlEmphasis.class, value = {CHROME, FF})
-@JsxClass(domClass = HtmlExample.class, value = FF45)
+@JsxClass(domClass = HtmlExample.class, value = FF60)
@JsxClass(domClass = HtmlFigure.class)
@JsxClass(domClass = HtmlFigureCaption.class)
@JsxClass(domClass = HtmlFooter.class)
@@ -181,7 +181,7 @@
@JsxClass(domClass = HtmlItalic.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlKeyboard.class, value = {CHROME, FF})
@JsxClass(domClass = HtmlLayer.class, value = CHROME)
-@JsxClass(domClass = HtmlListing.class, value = FF45)
+@JsxClass(domClass = HtmlListing.class, value = FF60)
@JsxClass(domClass = HtmlMark.class)
@JsxClass(domClass = HtmlNav.class)
@JsxClass(domClass = HtmlNoBreak.class, value = {CHROME, FF})
@@ -343,7 +343,7 @@
COLORS_MAP_IE.put("Olive", "#808000");
COLORS_MAP_IE.put("OliveDrab", "#6B8E23");
COLORS_MAP_IE.put("Orange", "#FFA500");
- COLORS_MAP_IE.put("OrangeRed", "#FF4500");
+ COLORS_MAP_IE.put("OrangeRed", "#FF6000");
COLORS_MAP_IE.put("Orchid", "#DA70D6");
COLORS_MAP_IE.put("PaleGoldenrod", "#EEE8AA");
COLORS_MAP_IE.put("PaleGreen", "#98FB98");
@@ -3578,7 +3578,7 @@
* Returns the {@code onmozpointerlockchange} event handler for this element.
* @return the {@code onmozpointerlockchange} event handler for this element
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockchange() {
return getEventHandler("mozpointerlockchange");
}
@@ -3587,7 +3587,7 @@
* Sets the {@code onmozpointerlockchange} event handler for this element.
* @param onmozpointerlockchange the {@code onmozpointerlockchange} event handler for this element
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockchange(final Object onmozpointerlockchange) {
setEventHandler("mozpointerlockchange", onmozpointerlockchange);
}
@@ -3596,7 +3596,7 @@
* Returns the {@code onmozpointerlockerror} event handler for this element.
* @return the {@code onmozpointerlockerror} event handler for this element
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockerror() {
return getEventHandler("mozpointerlockerror");
}
@@ -3605,7 +3605,7 @@
* Sets the {@code onmozpointerlockerror} event handler for this element.
* @param onmozpointerlockerror the {@code onmozpointerlockerror} event handler for this element
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockerror(final Object onmozpointerlockerror) {
setEventHandler("mozpointerlockerror", onmozpointerlockerror);
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLShadowElement.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit.javascript.host.html;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -25,7 +25,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass({CHROME, FF45})
+@JsxClass({CHROME, FF60})
public class HTMLShadowElement extends HTMLElement {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/moz/MozPowerManager.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.moz;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.SimpleScriptable;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
@@ -25,7 +25,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(FF45)
+@JsxClass(FF60)
public class MozPowerManager extends SimpleScriptable {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGAltGlyphElement.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.svg;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -26,7 +26,7 @@
* @author Ahmed Ashour
* @author Frank Danek
*/
-@JsxClass(domClass = SvgAltGlyph.class, value = FF45)
+@JsxClass(domClass = SvgAltGlyph.class, value = FF60)
public class SVGAltGlyphElement extends SVGTextPositioningElement {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGDocument.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -14,7 +14,7 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host.svg;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
import com.gargoylesoftware.htmlunit.javascript.configuration.JsxConstructor;
@@ -25,7 +25,7 @@
*
* @author Ahmed Ashour
*/
-@JsxClass(FF45)
+@JsxClass(FF60)
public class SVGDocument extends Document {
/**
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/svg/SVGElement.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -17,7 +17,7 @@
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.CHROME;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF;
-import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF45;
+import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF60;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.FF52;
import static com.gargoylesoftware.htmlunit.javascript.configuration.SupportedBrowser.IE;
@@ -441,7 +441,7 @@
* Returns the {@code onmozpointerlockchange} event handler.
* @return the {@code onmozpointerlockchange} event handler
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockchange() {
return getEventHandler("mozpointerlockchange");
}
@@ -450,7 +450,7 @@
* Sets the {@code onmozpointerlockchange} event handler.
* @param mozpointerlockchange the {@code onmozpointerlockchange} event handler
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockchange(final Object mozpointerlockchange) {
setEventHandler("mozpointerlockchange", mozpointerlockchange);
}
@@ -855,7 +855,7 @@
* Returns the {@code onmozpointerlockerror} event handler.
* @return the {@code onmozpointerlockerror} event handler
*/
- @JsxGetter(FF45)
+ @JsxGetter(FF60)
public Function getOnmozpointerlockerror() {
return getEventHandler("mozpointerlockerror");
}
@@ -864,7 +864,7 @@
* Sets the {@code onmozpointerlockerror} event handler.
* @param mozpointerlockerror the {@code onmozpointerlockerror} event handler
*/
- @JsxSetter(FF45)
+ @JsxSetter(FF60)
public void setOnmozpointerlockerror(final Object mozpointerlockerror) {
setEventHandler("mozpointerlockerror", mozpointerlockerror);
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserParameterizedRunner.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -134,9 +134,9 @@
runners_.add(new BrowserVersionClassRunnerWithParameters(
klass, BrowserVersion.CHROME, true, tests));
}
- if (browsers.contains("ff45")) {
+ if (browsers.contains("ff60")) {
runners_.add(new BrowserVersionClassRunnerWithParameters(
- klass, BrowserVersion.FIREFOX_45, true, tests));
+ klass, BrowserVersion.FIREFOX_60, true, tests));
}
if (browsers.contains("ff52")) {
runners_.add(new BrowserVersionClassRunnerWithParameters(
@@ -156,9 +156,9 @@
runners_.add(new BrowserVersionClassRunnerWithParameters(
klass, BrowserVersion.CHROME, false, tests));
}
- if (browsers.contains("hu-ff45")) {
+ if (browsers.contains("hu_ff60")) {
runners_.add(new BrowserVersionClassRunnerWithParameters(
- klass, BrowserVersion.FIREFOX_45, false, tests));
+ klass, BrowserVersion.FIREFOX_60, false, tests));
}
if (browsers.contains("hu-ff52")) {
runners_.add(new BrowserVersionClassRunnerWithParameters(
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2018-05-26 16:36:26 UTC (rev 15291)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2018-05-27 11:29:11 UTC (rev 15292)
@@ -77,8 +77,8 @@
if (browsers.contains("chrome")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.CHROME, true));
}
- if (browsers.contains("ff45")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_45, true));
+ if (browsers.contains("ff60")) {
+ runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_60, true));
}
if (browsers.contains("ff52")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_52, true));
@@ -94,8 +94,8 @@
if (browsers.contains("hu-chrome")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.CHROME, false));
}
- if (browsers.contains("hu-ff45")) {
- runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_45, false));
+ if (browsers.contains("hu-ff60")) {
+ runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_60, false));
}
if (browsers.contains("hu-ff52")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_52, false));
@@ -170,7 +170,7 @@
FF,
/** Firefox 45. */
- FF45,
+ FF60,
/** Firefox 52. */
FF52
@@ -217,7 +217,7 @@
* Alerts for Firefox 45. If not defined, {@link #FF()} is used.
* @return the alerts
*/
- String[] FF45() default { EMPTY_DEFAULT };
+ String[] FF60() default { EMPTY_DEFAULT };
/**
* Alerts for Firefox 52. If not defined, {@link #FF()} is used.
@@ -275,7 +275,7 @@
* Alerts for Firefox 45. If not defined, {@link #FF()} is used.
* @return the alerts
*/
- String[] FF45() default { EMPTY_DEFAULT };
+ String[] FF60() default { EMPTY_DEFAULT };
/**
* Alerts for Firefox 52. If not defined, {@link #FF()} is used.
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersion2Test.j...
[truncated message content] |
