From: <rb...@us...> - 2018-07-28 15:41:48
|
Revision: 15496 http://sourceforge.net/p/htmlunit/code/15496 Author: rbri Date: 2018-07-28 15:41:38 +0000 (Sat, 28 Jul 2018) Log Message: ----------- CHROME 68 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/host/css/StyleAttributes.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.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/HtmlImageInputTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.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/intl/DateTimeFormatTest.java trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties.Chrome.txt trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties2.Chrome.txt trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.Chrome.txt trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.notAttached.Chrome.txt Modified: trunk/htmlunit/src/changes/changes.xml =================================================================== --- trunk/htmlunit/src/changes/changes.xml 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/changes/changes.xml 2018-07-28 15:41:38 UTC (rev 15496) @@ -7,7 +7,7 @@ </properties> <body> - <release version="2.32" date="xx 2018" description="Bugfixes, FIREFOX_45 removed, FIREFOX_60 added"> + <release version="2.32" date="xx 2018" description="Bugfixes, FIREFOX_45 removed, FIREFOX_60 added, CHROME 68"> <action type="fix" dev="rbri" issue="1976"> Event listeners had to be functions, other types are ignored. </action> Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -210,8 +210,8 @@ EDGE.scriptAcceptHeader_ = "application/javascript, */*;q=0.8"; // CHROME - CHROME.applicationVersion_ = "5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36"; - CHROME.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36"; + CHROME.applicationVersion_ = "5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.75 Safari/537.36"; + CHROME.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.75 Safari/537.36"; CHROME.applicationCodeName_ = "Mozilla"; CHROME.vendor_ = "Google Inc."; Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -1057,7 +1057,7 @@ JS_LABEL_FORM_NULL, /** location.hash returns an encoded hash. */ - @BrowserFeature(FF) + @BrowserFeature({CHROME, FF}) JS_LOCATION_HASH_HASH_IS_ENCODED, /** @@ -1066,7 +1066,7 @@ * for url 'http://localhost/something/#%C3%BC'.<br> * IE evaluates to #%C3%BC. */ - @BrowserFeature(FF) + @BrowserFeature({CHROME, FF}) JS_LOCATION_HASH_IS_DECODED, /** @@ -1082,7 +1082,7 @@ * for url 'http://localhost/something/#ü'.<br> * IE evaluates to #ü. */ - @BrowserFeature(FF) + @BrowserFeature({CHROME, FF}) JS_LOCATION_HREF_HASH_IS_ENCODED, /** Map ignores the argument constructor. */ Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -3015,7 +3015,7 @@ VOLUME("volume", "volume"), /** The style property {@code webkitAlignContent}. */ - WEBKIT_ALIGN_CONTENT("webkitAlignContent", "webkit-align-content", ff("normal")), + WEBKIT_ALIGN_CONTENT("webkitAlignContent", "webkit-align-content", chrome("normal"), ff("normal")), /** The style property {@code WebkitAlignContent}. */ WEBKIT_ALIGN_CONTENT_("WebkitAlignContent", "webkit-align-content", ff("normal")), @@ -3024,7 +3024,7 @@ WEBKIT_ALIGN_CONTENT__("-webkit-align-content", "webkit-align-content", ff("normal")), /** The style property {@code webkitAlignItems}. */ - WEBKIT_ALIGN_ITEMS("webkitAlignItems", "webkit-align-items", ff("normal")), + WEBKIT_ALIGN_ITEMS("webkitAlignItems", "webkit-align-items", chrome("normal"), ff("normal")), /** The style property {@code WebkitAlignItems}. */ WEBKIT_ALIGN_ITEMS_("WebkitAlignItems", "webkit-align-items", ff("normal")), @@ -3033,7 +3033,7 @@ WEBKIT_ALIGN_ITEMS__("-webkit-align-items", "webkit-align-items", ff("normal")), /** The style property {@code webkitAlignSelf}. */ - WEBKIT_ALIGN_SELF("webkitAlignSelf", "webkit-align-self", ff("auto")), + WEBKIT_ALIGN_SELF("webkitAlignSelf", "webkit-align-self", chrome("auto"), ff("auto")), /** The style property {@code WebkitAlignSelf}. */ WEBKIT_ALIGN_SELF_("WebkitAlignSelf", "webkit-align-self", ff("auto")), @@ -3042,7 +3042,8 @@ WEBKIT_ALIGN_SELF__("-webkit-align-self", "webkit-align-self", ff("auto")), /** The style property {@code webkitAnimation}. */ - WEBKIT_ANIMATION("webkitAnimation", "webkit-animation", ff("")), + WEBKIT_ANIMATION("webkitAnimation", "webkit-animation", + chrome("none 0s ease 0s 1 normal none running"), ff("")), /** The style property {@code WebkitAnimation}. */ WEBKIT_ANIMATION_("WebkitAnimation", "webkit-animation", ff("")), @@ -3051,7 +3052,7 @@ WEBKIT_ANIMATION__("-webkit-animation", "webkit-animation", ff("")), /** The style property {@code webkitAnimationDelay}. */ - WEBKIT_ANIMATION_DELAY("webkitAnimationDelay", "webkit-animation-delay", ff("0s")), + WEBKIT_ANIMATION_DELAY("webkitAnimationDelay", "webkit-animation-delay", chrome("0s"), ff("0s")), /** The style property {@code WebkitAnimationDelay}. */ WEBKIT_ANIMATION_DELAY_("WebkitAnimationDelay", "webkit-animation-delay", ff("0s")), @@ -3060,7 +3061,8 @@ WEBKIT_ANIMATION_DELAY__("-webkit-animation-delay", "webkit-animation-delay", ff("0s")), /** The style property {@code webkitAnimationDirection}. */ - WEBKIT_ANIMATION_DIRECTION("webkitAnimationDirection", "webkit-animation-direction", ff("normal")), + WEBKIT_ANIMATION_DIRECTION("webkitAnimationDirection", "webkit-animation-direction", + chrome("normal"), ff("normal")), /** The style property {@code WebkitAnimationDirection}. */ WEBKIT_ANIMATION_DIRECTION_("WebkitAnimationDirection", "webkit-animation-direction", ff("normal")), @@ -3069,7 +3071,7 @@ WEBKIT_ANIMATION_DIRECTION__("-webkit-animation-direction", "webkit-animation-direction", ff("normal")), /** The style property {@code webkitAnimationDuration}. */ - WEBKIT_ANIMATION_DURATION("webkitAnimationDuration", "webkit-animation-duration", ff("0s")), + WEBKIT_ANIMATION_DURATION("webkitAnimationDuration", "webkit-animation-duration", chrome("0s"), ff("0s")), /** The style property {@code WebkitAnimationDuration}. */ WEBKIT_ANIMATION_DURATION_("WebkitAnimationDuration", "webkit-animation-duration", ff("0s")), @@ -3078,7 +3080,7 @@ WEBKIT_ANIMATION_DURATION__("-webkit-animation-duration", "webkit-animation-duration", ff("0s")), /** The style property {@code webkitAnimationFillMode}. */ - WEBKIT_ANIMATION_FILL_MODE("webkitAnimationFillMode", "webkit-animation-fill-mode", ff("none")), + WEBKIT_ANIMATION_FILL_MODE("webkitAnimationFillMode", "webkit-animation-fill-mode", chrome("none"), ff("none")), /** The style property {@code WebkitAnimationFillMode}. */ WEBKIT_ANIMATION_FILL_MODE_("WebkitAnimationFillMode", "webkit-animation-fill-mode", ff("none")), @@ -3088,7 +3090,7 @@ /** The style property {@code webkitAnimationIterationCount}. */ WEBKIT_ANIMATION_ITERATION_COUNT("webkitAnimationIterationCount", "webkit-animation-iteration-count", - ff("1")), + chrome("1"), ff("1")), /** The style property {@code WebkitAnimationIterationCount}. */ WEBKIT_ANIMATION_ITERATION_COUNT_("WebkitAnimationIterationCount", "webkit-animation-iteration-count", @@ -3099,7 +3101,7 @@ ff("1")), /** The style property {@code webkitAnimationName}. */ - WEBKIT_ANIMATION_NAME("webkitAnimationName", "webkit-animation-name", ff("none")), + WEBKIT_ANIMATION_NAME("webkitAnimationName", "webkit-animation-name", chrome("none"), ff("none")), /** The style property {@code WebkitAnimationName}. */ WEBKIT_ANIMATION_NAME_("WebkitAnimationName", "webkit-animation-name", ff("none")), @@ -3108,7 +3110,8 @@ WEBKIT_ANIMATION_NAME__("-webkit-animation-name", "webkit-animation-name", ff("none")), /** The style property {@code webkitAnimationPlayState}. */ - WEBKIT_ANIMATION_PLAY_STATE("webkitAnimationPlayState", "webkit-animation-play-state", ff("running")), + WEBKIT_ANIMATION_PLAY_STATE("webkitAnimationPlayState", "webkit-animation-play-state", + chrome("running"), ff("running")), /** The style property {@code WebkitAnimationPlayState}. */ WEBKIT_ANIMATION_PLAY_STATE_("WebkitAnimationPlayState", "webkit-animation-play-state", ff("running")), @@ -3118,7 +3121,7 @@ /** The style property {@code webkitAnimationTimingFunction}. */ WEBKIT_ANIMATION_TIMING_FUNCTION("webkitAnimationTimingFunction", "webkit-animation-timing-function", - ff("ease")), + chrome("ease"), ff("ease")), /** The style property {@code WebkitAnimationTimingFunction}. */ WEBKIT_ANIMATION_TIMING_FUNCTION_("WebkitAnimationTimingFunction", "webkit-animation-timing-function", @@ -3136,7 +3139,7 @@ /** The style property {@code webkitBackfaceVisibility}. */ WEBKIT_BACKFACE_VISIBILITY("webkitBackfaceVisibility", "webkit-backface-visibility", - ff("visible")), + chrome("visible"), ff("visible")), /** The style property {@code WebkitBackfaceVisibility}. */ WEBKIT_BACKFACE_VISIBILITY_("WebkitBackfaceVisibility", "webkit-backface-visibility", @@ -3147,7 +3150,8 @@ ff("visible")), /** The style property {@code webkitBackgroundClip}. */ - WEBKIT_BACKGROUND_CLIP("webkitBackgroundClip", "webkit-background-clip", ff("border-box")), + WEBKIT_BACKGROUND_CLIP("webkitBackgroundClip", "webkit-background-clip", + chrome("border-box"), ff("border-box")), /** The style property {@code WebkitBackgroundClip}. */ WEBKIT_BACKGROUND_CLIP_("WebkitBackgroundClip", "webkit-background-clip", ff("border-box")), @@ -3156,7 +3160,8 @@ WEBKIT_BACKGROUND_CLIP__("-webkit-background-clip", "webkit-background-clip", ff("border-box")), /** The style property {@code webkitBackgroundOrigin}. */ - WEBKIT_BACKGROUND_ORIGIN("webkitBackgroundOrigin", "webkit-background-origin", ff("padding-box")), + WEBKIT_BACKGROUND_ORIGIN("webkitBackgroundOrigin", "webkit-background-origin", + chrome("padding-box"), ff("padding-box")), /** The style property {@code WebkitBackgroundOrigin}. */ WEBKIT_BACKGROUND_ORIGIN_("WebkitBackgroundOrigin", "webkit-background-origin", ff("padding-box")), @@ -3165,7 +3170,7 @@ WEBKIT_BACKGROUND_ORIGIN__("-webkit-background-origin", "webkit-background-origin", ff("padding-box")), /** The style property {@code webkitBackgroundSize}. */ - WEBKIT_BACKGROUND_SIZE("webkitBackgroundSize", "webkit-background-size", ff("auto auto")), + WEBKIT_BACKGROUND_SIZE("webkitBackgroundSize", "webkit-background-size", chrome("auto"), ff("auto auto")), /** The style property {@code WebkitBackgroundSize}. */ WEBKIT_BACKGROUND_SIZE_("WebkitBackgroundSize", "webkit-background-size", ff("auto auto")), @@ -3199,7 +3204,7 @@ /** The style property {@code webkitBorderBottomLeftRadius}. */ WEBKIT_BORDER_BOTTOM_LEFT_RADIUS("webkitBorderBottomLeftRadius", "webkit-border-bottom-left-radius", - ff("0px")), + chrome("0px"), ff("0px")), /** The style property {@code WebkitBorderBottomLeftRadius}. */ WEBKIT_BORDER_BOTTOM_LEFT_RADIUS_("WebkitBorderBottomLeftRadius", "webkit-border-bottom-left-radius", @@ -3211,7 +3216,7 @@ /** The style property {@code webkitBorderBottomRightRadius}. */ WEBKIT_BORDER_BOTTOM_RIGHT_RADIUS("webkitBorderBottomRightRadius", "webkit-border-bottom-right-radius", - ff("0px")), + chrome("0px"), ff("0px")), /** The style property {@code WebkitBorderBottomRightRadius}. */ WEBKIT_BORDER_BOTTOM_RIGHT_RADIUS_("WebkitBorderBottomRightRadius", "webkit-border-bottom-right-radius", @@ -3247,7 +3252,7 @@ WEBKIT_BORDER_IMAGE__("-webkit-border-image", "webkit-border-image", ff("")), /** The style property {@code webkitBorderRadius}. */ - WEBKIT_BORDER_RADIUS("webkitBorderRadius", "webkit-border-radius", ff("")), + WEBKIT_BORDER_RADIUS("webkitBorderRadius", "webkit-border-radius", chrome("0px"), ff("")), /** The style property {@code WebkitBorderRadius}. */ WEBKIT_BORDER_RADIUS_("WebkitBorderRadius", "webkit-border-radius", ff("")), @@ -3268,7 +3273,8 @@ WEBKIT_BORDER_START_WIDTH("webkitBorderStartWidth", "webkit-border-start-width", chrome("0px")), /** The style property {@code webkitBorderTopLeftRadius}. */ - WEBKIT_BORDER_TOP_LEFT_RADIUS("webkitBorderTopLeftRadius", "webkit-border-top-left-radius", ff("0px")), + WEBKIT_BORDER_TOP_LEFT_RADIUS("webkitBorderTopLeftRadius", "webkit-border-top-left-radius", + chrome("0px"), ff("0px")), /** The style property {@code WebkitBorderTopLeftRadius}. */ WEBKIT_BORDER_TOP_LEFT_RADIUS_("WebkitBorderTopLeftRadius", "webkit-border-top-left-radius", ff("0px")), @@ -3278,7 +3284,8 @@ ff("0px")), /** The style property {@code webkitBorderTopRightRadius}. */ - WEBKIT_BORDER_TOP_RIGHT_RADIUS("webkitBorderTopRightRadius", "webkit-border-top-right-radius", ff("0px")), + WEBKIT_BORDER_TOP_RIGHT_RADIUS("webkitBorderTopRightRadius", "webkit-border-top-right-radius", + chrome("0px"), ff("0px")), /** The style property {@code WebkitBorderTopRightRadius}. */ WEBKIT_BORDER_TOP_RIGHT_RADIUS_("WebkitBorderTopRightRadius", "webkit-border-top-right-radius", ff("0px")), @@ -3357,7 +3364,7 @@ WEBKIT_BOX_REFLECT("webkitBoxReflect", "webkit-box-reflect", chrome("none")), /** The style property {@code webkitBoxShadow}. */ - WEBKIT_BOX_SHADOW("webkitBoxShadow", "webkit-box-shadow", ff("none")), + WEBKIT_BOX_SHADOW("webkitBoxShadow", "webkit-box-shadow", chrome("none"), ff("none")), /** The style property {@code WebkitBoxShadow}. */ WEBKIT_BOX_SHADOW_("WebkitBoxShadow", "webkit-box-shadow", ff("none")), @@ -3366,7 +3373,7 @@ WEBKIT_BOX_SHADOW__("-webkit-box-shadow", "webkit-box-shadow", ff("none")), /** The style property {@code webkitBoxSizing}. */ - WEBKIT_BOX_SIZING("webkitBoxSizing", "webkit-box-sizing", ff("content-box")), + WEBKIT_BOX_SIZING("webkitBoxSizing", "webkit-box-sizing", chrome("content-box"), ff("content-box")), /** The style property {@code WebkitBoxSizing}. */ WEBKIT_BOX_SIZING_("WebkitBoxSizing", "webkit-box-sizing", ff("content-box")), @@ -3374,6 +3381,9 @@ /** The style property {@code -webkit-box-sizing}. */ WEBKIT_BOX_SIZING__("-webkit-box-sizing", "webkit-box-sizing", ff("content-box")), + /** The style property {@code webkitClipPath}. */ + WEBKIT_CLIP_PATH("webkitClipPath", "webkit-clip-path", chrome("none")), + /** The style property {@code webkitColumnBreakAfter}. */ WEBKIT_COLUMN_BREAK_AFTER("webkitColumnBreakAfter", "webkit-column-break-after", chrome("auto")), @@ -3383,8 +3393,35 @@ /** The style property {@code webkitColumnBreakInside}. */ WEBKIT_COLUMN_BREAK_INSIDE("webkitColumnBreakInside", "webkit-column-break-inside", chrome("auto")), + /** The style property {@code webkitColumnCount}. */ + WEBKIT_COLUMN_COUNT("webkitColumnCount", "webkit-column-count", chrome("auto")), + + /** The style property {@code webkitColumnGap}. */ + WEBKIT_COLUMN_GAP("webkitColumnGap", "webkit-column-gap", chrome("normal")), + + /** The style property {@code webkitColumnRule}. */ + WEBKIT_COLUMN_RULE("webkitColumnRule", "webkit-column-rule", chrome("0px none rgb(0, 0, 0)")), + + /** The style property {@code webkitColumnRuleColor}. */ + WEBKIT_COLUMN_RULE_COLOR("webkitColumnRuleColor", "webkit-column-rule-color", chrome("rgb(0, 0, 0)")), + + /** The style property {@code webkitColumnRuleStyle}. */ + WEBKIT_COLUMN_RULE_STYLE("webkitColumnRuleStyle", "webkit-column-rule-style", chrome("none")), + + /** The style property {@code webkitColumnRuleWidth}. */ + WEBKIT_COLUMN_RULE_WIDTH("webkitColumnRuleWidth", "webkit-column-rule-width", chrome("0px")), + + /** The style property {@code webkitColumnSpan}. */ + WEBKIT_COLUMN_SPAN("webkitColumnSpan", "webkit-column-rule-span", chrome("none")), + + /** The style property {@code webkitColumnWidth}. */ + WEBKIT_COLUMN_WIDTH("webkitColumnWidth", "webkit-column-width", chrome("auto")), + + /** The style property {@code webkitColumns}. */ + WEBKIT_COLUMNS("webkitColumns", "webkit-columns", chrome("auto auto")), + /** The style property {@code webkitFilter}. */ - WEBKIT_FILTER("webkitFilter", "webkit-filter", ff("none")), + WEBKIT_FILTER("webkitFilter", "webkit-filter", chrome("none"), ff("none")), /** The style property {@code WebkitFilter}. */ WEBKIT_FILTER_("WebkitFilter", "webkit-filter", ff("none")), @@ -3393,7 +3430,7 @@ WEBKIT_FILTER__("-webkit-filter", "webkit-filter", ff("none")), /** The style property {@code webkitFlex}. */ - WEBKIT_FLEX("webkitFlex", "webkit-flex", ff("")), + WEBKIT_FLEX("webkitFlex", "webkit-flex", chrome("0 1 auto"), ff("")), /** The style property {@code WebkitFlex}. */ WEBKIT_FLEX_("WebkitFlex", "webkit-flex", ff("")), @@ -3402,7 +3439,7 @@ WEBKIT_FLEX__("-webkit-flex", "webkit-flex", ff("")), /** The style property {@code webkitFlexBasis}. */ - WEBKIT_FLEX_BASIS("webkitFlexBasis", "webkit-flex-basis", ff("auto")), + WEBKIT_FLEX_BASIS("webkitFlexBasis", "webkit-flex-basis", chrome("auto"), ff("auto")), /** The style property {@code WebkitFlexBasis}. */ WEBKIT_FLEX_BASIS_("WebkitFlexBasis", "webkit-flex-basis", ff("auto")), @@ -3411,7 +3448,7 @@ WEBKIT_FLEX_BASIS__("-webkit-flex-basis", "webkit-flex-basis", ff("auto")), /** The style property {@code webkitFlexDirection}. */ - WEBKIT_FLEX_DIRECTION("webkitFlexDirection", "webkit-flex-direction", ff("row")), + WEBKIT_FLEX_DIRECTION("webkitFlexDirection", "webkit-flex-direction", chrome("row"), ff("row")), /** The style property {@code WebkitFlexDirection}. */ WEBKIT_FLEX_DIRECTION_("WebkitFlexDirection", "webkit-flex-direction", ff("row")), @@ -3420,7 +3457,7 @@ WEBKIT_FLEX_DIRECTION__("-webkit-flex-direction", "webkit-flex-direction", ff("row")), /** The style property {@code webkitFlexFlow}. */ - WEBKIT_FLEX_FLOW("webkitFlexFlow", "webkit-flex-flow", ff("")), + WEBKIT_FLEX_FLOW("webkitFlexFlow", "webkit-flex-flow", chrome("row nowrap"), ff("")), /** The style property {@code WebkitFlexFlow}. */ WEBKIT_FLEX_FLOW_("WebkitFlexFlow", "webkit-flex-flow", ff("")), @@ -3429,7 +3466,7 @@ WEBKIT_FLEX_FLOW__("-webkit-flex-flow", "webkit-flex-flow", ff("")), /** The style property {@code webkitFlexGrow}. */ - WEBKIT_FLEX_GROW("webkitFlexGrow", "webkit-flex-grow", ff("0")), + WEBKIT_FLEX_GROW("webkitFlexGrow", "webkit-flex-grow", chrome("0"), ff("0")), /** The style property {@code WebkitFlexGrow}. */ WEBKIT_FLEX_GROW_("WebkitFlexGrow", "webkit-flex-grow", ff("0")), @@ -3438,7 +3475,7 @@ WEBKIT_FLEX_GROW__("-webkit-flex-grow", "webkit-flex-grow", ff("0")), /** The style property {@code webkitFlexShrink}. */ - WEBKIT_FLEX_SHRINK("webkitFlexShrink", "webkit-flex-shrink", ff("1")), + WEBKIT_FLEX_SHRINK("webkitFlexShrink", "webkit-flex-shrink", chrome("1"), ff("1")), /** The style property {@code WebkitFlexShrink}. */ WEBKIT_FLEX_SHRINK_("WebkitFlexShrink", "webkit-flex-shrink", ff("1")), @@ -3447,7 +3484,7 @@ WEBKIT_FLEX_SHRINK__("-webkit-flex-shrink", "webkit-flex-shrink", ff("1")), /** The style property {@code webkitFlexWrap}. */ - WEBKIT_FLEX_WRAP("webkitFlexWrap", "webkit-flex-wrap", ff("nowrap")), + WEBKIT_FLEX_WRAP("webkitFlexWrap", "webkit-flex-wrap", chrome("nowrap"), ff("nowrap")), /** The style property {@code WebkitFlexWrap}. */ WEBKIT_FLEX_WRAP_("WebkitFlexWrap", "webkit-flex-wrap", ff("nowrap")), @@ -3455,6 +3492,9 @@ /** The style property {@code -webkit-flex-wrap}. */ WEBKIT_FLEX_WRAP__("-webkit-flex-wrap", "webkit-flex-wrap", ff("nowrap")), + /** The style property {@code webkitFontFeatureSettings}. */ + WEBKIT_FONT_FEATURE_SETTINGS("webkitFontFeatureSettings", "webkit-font-feature-settings", chrome("normal")), + /** The style property {@code webkitFontSizeDelta}. */ WEBKIT_FONT_SIZE_DELTA("webkitFontSizeDelta", "webkit-font-size-delta", chrome("")), @@ -3468,7 +3508,7 @@ WEBKIT_HYPHENATE_CHARACTER("webkitHyphenateCharacter", "webkit-hyphenate-character", chrome("auto")), /** The style property {@code webkitJustifyContent}. */ - WEBKIT_JUSTIFY_CONTENT("webkitJustifyContent", "webkit-justify-content", ff("normal")), + WEBKIT_JUSTIFY_CONTENT("webkitJustifyContent", "webkit-justify-content", chrome("normal"), ff("normal")), /** The style property {@code WebkitJustifyContent}. */ WEBKIT_JUSTIFY_CONTENT_("WebkitJustifyContent", "webkit-justify-content", ff("normal")), @@ -3646,8 +3686,11 @@ /** The style property {@code webkitMinLogicalWidth}. */ WEBKIT_MIN_LOGICAL_WIDTH("webkitMinLogicalWidth", "webkit-min-logical-width", chrome("0px")), + /** The style property {@code webkitOpacity}. */ + WEBKIT_OPACITY("webkitOpacity", "webkit-opacity", chrome("1")), + /** The style property {@code webkitOrder}. */ - WEBKIT_ORDER("webkitOrder", "webkit-order", ff("0")), + WEBKIT_ORDER("webkitOrder", "webkit-order", chrome("0"), ff("0")), /** The style property {@code WebkitOrder}. */ WEBKIT_ORDER_("WebkitOrder", "webkit-order", ff("0")), @@ -3668,7 +3711,7 @@ WEBKIT_PADDING_START("webkitPaddingStart", "webkit-padding-start", chrome("0px")), /** The style property {@code webkitPerspective}. */ - WEBKIT_PERSPECTIVE("webkitPerspective", "webkit-perspective", ff("none")), + WEBKIT_PERSPECTIVE("webkitPerspective", "webkit-perspective", chrome("none"), ff("none")), /** The style property {@code WebkitPerspective}. */ WEBKIT_PERSPECTIVE_("WebkitPerspective", "webkit-perspective", ff("none")), @@ -3677,7 +3720,8 @@ WEBKIT_PERSPECTIVE__("-webkit-perspective", "webkit-perspective", ff("none")), /** The style property {@code webkitPerspectiveOrigin}. */ - WEBKIT_PERSPECTIVE_ORIGIN("webkitPerspectiveOrigin", "webkit-perspective-origin", ff("625px 172.5px")), + WEBKIT_PERSPECTIVE_ORIGIN("webkitPerspectiveOrigin", "webkit-perspective-origin", + chrome("456.5px 161px"), ff("625px 172.5px")), /** The style property {@code WebkitPerspectiveOrigin}. */ WEBKIT_PERSPECTIVE_ORIGIN_("WebkitPerspectiveOrigin", "webkit-perspective-origin", ff("625px 172.5px")), @@ -3700,6 +3744,15 @@ /** The style property {@code webkitRubyPosition}. */ WEBKIT_RUBY_POSITION("webkitRubyPosition", "webkit-ruby-position", chrome("before")), + /** The style property {@code webkitShapeImageThreshold}. */ + WEBKIT_SHAPE_IMAGE_THRESHOLD("webkitShapeImageThreshold", "webkit-shape-image-threshold", chrome("0")), + + /** The style property {@code webkitShapeMargin}. */ + WEBKIT_SHAPE_MARGIN("webkitShapeMargin", "webkit-shape-margin", chrome("0px")), + + /** The style property {@code webkitShapeOutside}. */ + WEBKIT_SHAPE_OUTSIDE("webkitShapeOutside", "webkit-shape-outside", chrome("none")), + /** The style property {@code webkitTapHighlightColor}. */ WEBKIT_TAP_HIGHLIGHT_COLOR("webkitTapHighlightColor", "webkit-tap-highlight-color", chrome("rgba(0, 0, 0, 0.18)")), @@ -3745,7 +3798,7 @@ WEBKIT_TEXT_SECURITY("webkitTextSecurity", "webkit-text-security", chrome("none")), /** The style property {@code webkitTextSizeAdjust}. */ - WEBKIT_TEXT_SIZE_ADJUST("webkitTextSizeAdjust", "webkit-text-size-adjust", ff("auto")), + WEBKIT_TEXT_SIZE_ADJUST("webkitTextSizeAdjust", "webkit-text-size-adjust", chrome("auto"), ff("auto")), /** The style property {@code WebkitTextSizeAdjust}. */ WEBKIT_TEXT_SIZE_ADJUST_("WebkitTextSizeAdjust", "webkit-text-size-adjust", ff("auto")), @@ -3784,7 +3837,7 @@ WEBKIT_TEXT_STROKE_WIDTH__("-webkit-text-stroke-width", "webkit-text-stroke-width", ff("0px")), /** The style property {@code webkitTransform}. */ - WEBKIT_TRANSFORM("webkitTransform", "webkit-transform", ff("none")), + WEBKIT_TRANSFORM("webkitTransform", "webkit-transform", chrome("none"), ff("none")), /** The style property {@code WebkitTransform}. */ WEBKIT_TRANSFORM_("WebkitTransform", "webkit-transform", ff("none")), @@ -3793,7 +3846,8 @@ WEBKIT_TRANSFORM__("-webkit-transform", "webkit-transform", ff("none")), /** The style property {@code webkitTransformOrigin}. */ - WEBKIT_TRANSFORM_ORIGIN("webkitTransformOrigin", "webkit-transform-origin", ff("625px 172.5px")), + WEBKIT_TRANSFORM_ORIGIN("webkitTransformOrigin", "webkit-transform-origin", + chrome("620px 161px"), ff("625px 172.5px")), /** The style property {@code WebkitTransformOrigin}. */ WEBKIT_TRANSFORM_ORIGIN_("WebkitTransformOrigin", "webkit-transform-origin", ff("625px 172.5px")), @@ -3811,7 +3865,7 @@ WEBKIT_TRANSFORM_ORIGIN_Z("webkitTransformOriginZ", "webkit-transform-origin-z", chrome("")), /** The style property {@code webkitTransformStyle}. */ - WEBKIT_TRANSFORM_STYLE("webkitTransformStyle", "webkit-transform-style", ff("flat")), + WEBKIT_TRANSFORM_STYLE("webkitTransformStyle", "webkit-transform-style", chrome("flat"), ff("flat")), /** The style property {@code WebkitTransformStyle}. */ WEBKIT_TRANSFORM_STYLE_("WebkitTransformStyle", "webkit-transform-style", ff("flat")), @@ -3820,7 +3874,7 @@ WEBKIT_TRANSFORM_STYLE__("-webkit-transform-style", "webkit-transform-style", ff("flat")), /** The style property {@code webkitTransition}. */ - WEBKIT_TRANSITION("webkitTransition", "webkit-transition", ff("")), + WEBKIT_TRANSITION("webkitTransition", "webkit-transition", chrome("all 0s ease 0s"), ff("")), /** The style property {@code WebkitTransition}. */ WEBKIT_TRANSITION_("WebkitTransition", "webkit-transition", ff("")), @@ -3829,7 +3883,7 @@ WEBKIT_TRANSITION__("-webkit-transition", "webkit-transition", ff("")), /** The style property {@code webkitTransitionDelay}. */ - WEBKIT_TRANSITION_DELAY("webkitTransitionDelay", "webkit-transition-delay", ff("0s")), + WEBKIT_TRANSITION_DELAY("webkitTransitionDelay", "webkit-transition-delay", chrome("0s"), ff("0s")), /** The style property {@code WebkitTransitionDelay}. */ WEBKIT_TRANSITION_DELAY_("WebkitTransitionDelay", "webkit-transition-delay", ff("0s")), @@ -3838,7 +3892,7 @@ WEBKIT_TRANSITION_DELAY__("-webkit-transition-delay", "webkit-transition-delay", ff("0s")), /** The style property {@code webkitTransitionDuration}. */ - WEBKIT_TRANSITION_DURATION("webkitTransitionDuration", "webkit-transition-duration", ff("0s")), + WEBKIT_TRANSITION_DURATION("webkitTransitionDuration", "webkit-transition-duration", chrome("0s"), ff("0s")), /** The style property {@code WebkitTransitionDuration}. */ WEBKIT_TRANSITION_DURATION_("WebkitTransitionDuration", "webkit-transition-duration", ff("0s")), @@ -3847,7 +3901,7 @@ WEBKIT_TRANSITION_DURATION__("-webkit-transition-duration", "webkit-transition-duration", ff("0s")), /** The style property {@code webkitTransitionProperty}. */ - WEBKIT_TRANSITION_PROPERTY("webkitTransitionProperty", "webkit-transition-property", ff("all")), + WEBKIT_TRANSITION_PROPERTY("webkitTransitionProperty", "webkit-transition-property", chrome("all"), ff("all")), /** The style property {@code WebkitTransitionProperty}. */ WEBKIT_TRANSITION_PROPERTY_("WebkitTransitionProperty", "webkit-transition-property", ff("all")), @@ -3857,7 +3911,7 @@ /** The style property {@code webkitTransitionTimingFunction}. */ WEBKIT_TRANSITION_TIMING_FUNCTION("webkitTransitionTimingFunction", "webkit-transition-timing-function", - ff("ease")), + chrome("ease"), ff("ease")), /** The style property {@code WebkitTransitionTimingFunction}. */ WEBKIT_TRANSITION_TIMING_FUNCTION_("WebkitTransitionTimingFunction", "webkit-transition-timing-function", @@ -3874,7 +3928,7 @@ WEBKIT_USER_MODIFY("webkitUserModify", "webkit-user-modify", chrome("read-only")), /** The style property {@code webkitUserSelect}. */ - WEBKIT_USER_SELECT("webkitUserSelect", "webkit-user-select", ff("auto")), + WEBKIT_USER_SELECT("webkitUserSelect", "webkit-user-select", chrome("auto"), ff("auto")), /** The style property {@code WebkitUserSelect}. */ WEBKIT_USER_SELECT_("WebkitUserSelect", "webkit-user-select", ff("auto")), Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -76,7 +76,7 @@ commonFormats.put("", mmSlash); commonFormats.put("ar", "dd\u200F/MM\u200F/YYYY"); commonFormats.put("ar-SA", "d\u200F/M\u200F/YYYY هـ"); - commonFormats.put("ban", ddDot); + commonFormats.put("ban", mmSlash); commonFormats.put("be", ddDot); commonFormats.put("bg", ddDot + "\u200E \u0433."); commonFormats.put("ca", ddSlash); @@ -153,9 +153,9 @@ commonFormats.put("sq", ddDot); FF_52_FORMATS_.putAll(commonFormats); + FF_52_FORMATS_.put("ban", ddDot); FF_60_FORMATS_.putAll(commonFormats); - FF_60_FORMATS_.put("ban", mmSlash); CHROME_FORMATS_.put("be", yyyyDash); CHROME_FORMATS_.put("en-CA", yyyyDash); @@ -165,7 +165,6 @@ CHROME_FORMATS_.put("es-US", ddSlash); CHROME_FORMATS_.put("fr-CH", ddDot); CHROME_FORMATS_.put("hr", ddDotBlankDot); - CHROME_FORMATS_.put("in", ddDot); CHROME_FORMATS_.put("in-ID", ddSlash); CHROME_FORMATS_.put("is", yyyyDash); CHROME_FORMATS_.put("iw", ddDot); @@ -193,6 +192,7 @@ IE_FORMATS_.put("ar-SD", rightToLeft); IE_FORMATS_.put("ar-SY", rightToLeft); IE_FORMATS_.put("ar-YE", rightToLeft); + IE_FORMATS_.put("ban", ddDot); IE_FORMATS_.put("cs", ddDot); IE_FORMATS_.put("da", ddDash); IE_FORMATS_.put("en-IN", ddDash); Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ExternalTest.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -50,7 +50,7 @@ public class ExternalTest { /** Chrome driver. */ - static String CHROME_DRIVER_ = "2.40"; + static String CHROME_DRIVER_ = "2.41"; /** Gecko driver. */ static String GECKO_DRIVER_ = "0.21.0"; /** IE driver. */ Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementPropertiesTest.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -2765,7 +2765,7 @@ + "volume,webkitAudioDecodedByteCount,webkitDecodedFrameCount," + "webkitDisplayingFullscreen,webkitDroppedFrameCount," + "webkitEnterFullscreen(),webkitEnterFullScreen()," - + "webkitExitFullScreen(),webkitExitFullscreen(),webkitSupportsFullscreen,webkitVideoDecodedByteCount," + + "webkitExitFullscreen(),webkitExitFullScreen(),webkitSupportsFullscreen,webkitVideoDecodedByteCount," + "width", FF52 = "addTextTrack(),autoplay,buffered,canPlayType(),controls,crossOrigin,currentSrc,currentTime," + "defaultMuted,defaultPlaybackRate,duration,ended,error,fastSeek(),getVideoPlaybackQuality()," @@ -3296,21 +3296,21 @@ + "linkColor,links,location,onabort,onauxclick,onbeforecopy," + "onbeforecut,onbeforepaste,onblur,oncancel,oncanplay,oncanplaythrough,onchange,onclick,onclose," + "oncontextmenu,oncopy,oncuechange,oncut,ondblclick,ondrag,ondragend,ondragenter,ondragleave," - + "ondragover,ondragstart,ondrop,ondurationchange,onemptied,onended,onerror,onfocus," + + "ondragover,ondragstart,ondrop,ondurationchange,onemptied,onended,onerror,onfocus,onfreeze," + "ongotpointercapture,oninput,oninvalid,onkeydown,onkeypress,onkeyup,onload,onloadeddata," + "onloadedmetadata,onloadstart,onlostpointercapture,onmousedown,onmouseenter,onmouseleave,onmousemove," + "onmouseout,onmouseover,onmouseup,onmousewheel,onpaste,onpause,onplay,onplaying,onpointercancel," + "onpointerdown,onpointerenter,onpointerleave,onpointerlockchange,onpointerlockerror,onpointermove," + "onpointerout,onpointerover,onpointerup,onprogress,onratechange,onreadystatechange,onreset,onresize," - + "onscroll,onsearch,onseeked,onseeking,onselect,onselectionchange,onselectstart,onstalled," + + "onresume,onscroll,onsearch,onseeked,onseeking,onselect,onselectionchange,onselectstart,onstalled," + "onsubmit,onsuspend,ontimeupdate,ontoggle,onvisibilitychange,onvolumechange,onwaiting," + "onwebkitfullscreenchange," - + "onwebkitfullscreenerror,onwheel,open(),origin,plugins,pointerLockElement,preferredStylesheetSet," + + "onwebkitfullscreenerror,onwheel,open(),origin,plugins,pointerLockElement," + "prepend(),queryCommandEnabled(),queryCommandIndeterm(),queryCommandState(),queryCommandSupported()," + "queryCommandValue(),querySelector(),querySelectorAll(),readyState,referrer,registerElement()," + "releaseEvents(),rootElement," - + "scripts,scrollingElement,selectedStylesheetSet,styleSheets,title,URL," - + "visibilityState,vlinkColor," + + "scripts,scrollingElement,styleSheets,title,URL," + + "visibilityState,vlinkColor,wasDiscarded," + "webkitCancelFullScreen(),webkitCurrentFullScreenElement,webkitExitFullscreen()," + "webkitFullscreenElement,webkitFullscreenEnabled,webkitHidden,webkitIsFullScreen," + "webkitVisibilityState,write(),writeln(),xmlEncoding,xmlStandalone,xmlVersion", Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostClassNameTest.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -2078,9 +2078,10 @@ * @throws Exception if an error occurs */ @Test - @Alerts(DEFAULT = "exception", - FF = "function DOMRectList() {\n [native code]\n}") - @NotYetImplemented(FF) + @Alerts(DEFAULT = "function DOMRectList() {\n [native code]\n}", + CHROME = "function DOMRectList() { [native code] }", + IE = "exception") + @NotYetImplemented({CHROME, FF}) public void domRectList() throws Exception { test("DOMRectList"); } Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/HostTypeOfTest.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -14,6 +14,7 @@ */ package com.gargoylesoftware.htmlunit.general; +import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME; import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF; import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE; @@ -1302,9 +1303,9 @@ * @throws Exception if an error occurs */ @Test - @Alerts(DEFAULT = "undefined", - FF = "function") - @NotYetImplemented(FF) + @Alerts(DEFAULT = "function", + IE = "undefined") + @NotYetImplemented({CHROME, FF}) public void domRectList() throws Exception { test("DOMRectList"); } Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImageInputTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImageInputTest.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImageInputTest.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -73,7 +73,7 @@ */ @Test @Alerts(DEFAULT = "§§URL§§?button.x=0&button.y=0", - CHROME = "§§URL§§?button.x=30&button.y=8", + CHROME = "§§URL§§?button.x=28&button.y=8", IE = "§§URL§§?button.x=14&button.y=15") @NotYetImplemented({CHROME, IE}) public void click_NoPosition_NoValue() throws Exception { Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -148,9 +148,9 @@ * @throws Exception if an error occurs */ @Test - @Alerts(DEFAULT = {"#a b", "§§URL§§#a b", "#a%20b", "§§URL§§#a%20b", "#abc;,/?:@&=+$-_.!~*()ABC123foo", + @Alerts(DEFAULT = {"#a%20b", "§§URL§§#a%20b", "#a%20b", "§§URL§§#a%20b", "#abc;,/?:@&=+$-_.!~*()ABC123foo", "#%25%20%5E%5B%5D%7C%22%3C%3E%7B%7D%5C"}, - FF = {"#a%20b", "§§URL§§#a%20b", "#a%20b", "§§URL§§#a%20b", "#abc;,/?:@&=+$-_.!~*()ABC123foo", + IE = {"#a b", "§§URL§§#a b", "#a%20b", "§§URL§§#a%20b", "#abc;,/?:@&=+$-_.!~*()ABC123foo", "#%25%20%5E%5B%5D%7C%22%3C%3E%7B%7D%5C"}) public void hashEncoding() throws Exception { final String html = "<html><head><title>First</title><script>\n" @@ -177,7 +177,7 @@ */ @Test @Alerts({"#myDataTable=foo%3Dojkoj", "§§URL§§#myDataTable=foo%3Dojkoj"}) - @NotYetImplemented(FF) + @NotYetImplemented({CHROME, FF}) public void hashEncoding2() throws Exception { final String html = "<html><body><script>\n" + "window.location.hash = 'myDataTable=foo%3Dojkoj';\n" @@ -194,7 +194,6 @@ @Test @Alerts(DEFAULT = {"#%C3%BC%C3%B6%C3%A4", "§§URL§§#%C3%BC%C3%B6%C3%A4"}, IE = {"#üöä", "§§URL§§#üöä"}) - @NotYetImplemented(CHROME) public void hashEncoding3() throws Exception { final String html = "<html><body><script>\n" + "window.location.hash = 'üöä';\n" @@ -209,8 +208,8 @@ * @throws Exception if an error occurs */ @Test - @Alerts(DEFAULT = "#<a>foobar</a>", - FF = "#%3Ca%3Efoobar%3C/a%3E") + @Alerts(DEFAULT = "#%3Ca%3Efoobar%3C/a%3E", + IE = "#<a>foobar</a>") public void hash() throws Exception { checkHash(URL_FIRST + "?#<a>foobar</a>"); } Modified: 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/ElementClientWidthTest.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementClientWidthTest.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -1793,7 +1793,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(CHROME = "92", + @Alerts(CHROME = "47", FF52 = "50", FF60 = "48", IE = "100") @@ -1822,7 +1822,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(CHROME = "58", + @Alerts(CHROME = "54", FF52 = "96", FF60 = "94", IE = "114") Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetWidthTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetWidthTest.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetWidthTest.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -1789,7 +1789,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "96", + @Alerts(DEFAULT = "51", FF52 = "56", FF60 = "54", IE = "102") @@ -1818,7 +1818,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "62", + @Alerts(DEFAULT = "58", FF52 = "102", FF60 = "100", IE = "116") Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java 2018-07-28 15:41:38 UTC (rev 15496) @@ -119,8 +119,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "20.12.2012", - FF60 = "12/20/2012", + @Alerts(DEFAULT = "12/20/2012", + FF52 = "20.12.2012", IE = "\u200E20\u200E.\u200E12\u200E.\u200E2012") public void format_ban() throws Exception { test("new Intl.DateTimeFormat('ban').format(date)"); @@ -1174,7 +1174,6 @@ */ @Test @Alerts(DEFAULT = "20/12/2012", - CHROME = "20.12.2012", IE = "\u200E20\u200E/\u200E12\u200E/\u200E2012") public void format_in() throws Exception { test("new Intl.DateTimeFormat('in').format(date)"); Modified: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties.Chrome.txt =================================================================== --- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties.Chrome.txt 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties.Chrome.txt 2018-07-28 15:41:38 UTC (rev 15496) @@ -293,8 +293,24 @@ vectorEffect verticalAlign visibility +webkitAlignContent +webkitAlignItems +webkitAlignSelf +webkitAnimation +webkitAnimationDelay +webkitAnimationDirection +webkitAnimationDuration +webkitAnimationFillMode +webkitAnimationIterationCount +webkitAnimationName +webkitAnimationPlayState +webkitAnimationTimingFunction webkitAppRegion webkitAppearance +webkitBackfaceVisibility +webkitBackgroundClip +webkitBackgroundOrigin +webkitBackgroundSize webkitBorderAfter webkitBorderAfterColor webkitBorderAfterStyle @@ -303,6 +319,8 @@ webkitBorderBeforeColor webkitBorderBeforeStyle webkitBorderBeforeWidth +webkitBorderBottomLeftRadius +webkitBorderBottomRightRadius webkitBorderEnd webkitBorderEndColor webkitBorderEndStyle @@ -309,10 +327,13 @@ webkitBorderEndWidth webkitBorderHorizontalSpacing webkitBorderImage +webkitBorderRadius webkitBorderStart webkitBorderStartColor webkitBorderStartStyle webkitBorderStartWidth +webkitBorderTopLeftRadius +webkitBorderTopRightRadius webkitBorderVerticalSpacing webkitBoxAlign webkitBoxDecorationBreak @@ -322,13 +343,35 @@ webkitBoxOrient webkitBoxPack webkitBoxReflect +webkitBoxShadow +webkitBoxSizing +webkitClipPath webkitColumnBreakAfter webkitColumnBreakBefore webkitColumnBreakInside +webkitColumnCount +webkitColumnGap +webkitColumnRule +webkitColumnRuleColor +webkitColumnRuleStyle +webkitColumnRuleWidth +webkitColumnSpan +webkitColumnWidth +webkitColumns +webkitFilter +webkitFlex +webkitFlexBasis +webkitFlexDirection +webkitFlexFlow +webkitFlexGrow +webkitFlexShrink +webkitFlexWrap +webkitFontFeatureSettings webkitFontSizeDelta webkitFontSmoothing webkitHighlight webkitHyphenateCharacter +webkitJustifyContent webkitLineBreak webkitLineClamp webkitLocale @@ -365,15 +408,22 @@ webkitMaxLogicalWidth webkitMinLogicalHeight webkitMinLogicalWidth +webkitOpacity +webkitOrder webkitPaddingAfter webkitPaddingBefore webkitPaddingEnd webkitPaddingStart +webkitPerspective +webkitPerspectiveOrigin webkitPerspectiveOriginX webkitPerspectiveOriginY webkitPrintColorAdjust webkitRtlOrdering webkitRubyPosition +webkitShapeImageThreshold +webkitShapeMargin +webkitShapeOutside webkitTapHighlightColor webkitTextCombine webkitTextDecorationsInEffect @@ -384,14 +434,24 @@ webkitTextFillColor webkitTextOrientation webkitTextSecurity +webkitTextSizeAdjust webkitTextStroke webkitTextStrokeColor webkitTextStrokeWidth +webkitTransform +webkitTransformOrigin webkitTransformOriginX webkitTransformOriginY webkitTransformOriginZ +webkitTransformStyle +webkitTransition +webkitTransitionDelay +webkitTransitionDuration +webkitTransitionProperty +webkitTransitionTimingFunction webkitUserDrag webkitUserModify +webkitUserSelect webkitWritingMode whiteSpace widows Modified: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties2.Chrome.txt =================================================================== --- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties2.Chrome.txt 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties2.Chrome.txt 2018-07-28 15:41:38 UTC (rev 15496) @@ -292,8 +292,24 @@ vectorEffect verticalAlign visibility +webkitAlignContent +webkitAlignItems +webkitAlignSelf +webkitAnimation +webkitAnimationDelay +webkitAnimationDirection +webkitAnimationDuration +webkitAnimationFillMode +webkitAnimationIterationCount +webkitAnimationName +webkitAnimationPlayState +webkitAnimationTimingFunction webkitAppRegion webkitAppearance +webkitBackfaceVisibility +webkitBackgroundClip +webkitBackgroundOrigin +webkitBackgroundSize webkitBorderAfter webkitBorderAfterColor webkitBorderAfterStyle @@ -302,6 +318,8 @@ webkitBorderBeforeColor webkitBorderBeforeStyle webkitBorderBeforeWidth +webkitBorderBottomLeftRadius +webkitBorderBottomRightRadius webkitBorderEnd webkitBorderEndColor webkitBorderEndStyle @@ -308,10 +326,13 @@ webkitBorderEndWidth webkitBorderHorizontalSpacing webkitBorderImage +webkitBorderRadius webkitBorderStart webkitBorderStartColor webkitBorderStartStyle webkitBorderStartWidth +webkitBorderTopLeftRadius +webkitBorderTopRightRadius webkitBorderVerticalSpacing webkitBoxAlign webkitBoxDecorationBreak @@ -321,13 +342,35 @@ webkitBoxOrient webkitBoxPack webkitBoxReflect +webkitBoxShadow +webkitBoxSizing +webkitClipPath webkitColumnBreakAfter webkitColumnBreakBefore webkitColumnBreakInside +webkitColumnCount +webkitColumnGap +webkitColumnRule +webkitColumnRuleColor +webkitColumnRuleStyle +webkitColumnRuleWidth +webkitColumnSpan +webkitColumnWidth +webkitColumns +webkitFilter +webkitFlex +webkitFlexBasis +webkitFlexDirection +webkitFlexFlow +webkitFlexGrow +webkitFlexShrink +webkitFlexWrap +webkitFontFeatureSettings webkitFontSizeDelta webkitFontSmoothing webkitHighlight webkitHyphenateCharacter +webkitJustifyContent webkitLineBreak webkitLineClamp webkitLocale @@ -364,15 +407,22 @@ webkitMaxLogicalWidth webkitMinLogicalHeight webkitMinLogicalWidth +webkitOpacity +webkitOrder webkitPaddingAfter webkitPaddingBefore webkitPaddingEnd webkitPaddingStart +webkitPerspective +webkitPerspectiveOrigin webkitPerspectiveOriginX webkitPerspectiveOriginY webkitPrintColorAdjust webkitRtlOrdering webkitRubyPosition +webkitShapeImageThreshold +webkitShapeMargin +webkitShapeOutside webkitTapHighlightColor webkitTextCombine webkitTextDecorationsInEffect @@ -383,14 +433,24 @@ webkitTextFillColor webkitTextOrientation webkitTextSecurity +webkitTextSizeAdjust webkitTextStroke webkitTextStrokeColor webkitTextStrokeWidth +webkitTransform +webkitTransformOrigin webkitTransformOriginX webkitTransformOriginY webkitTransformOriginZ +webkitTransformStyle +webkitTransition +webkitTransitionDelay +webkitTransitionDuration +webkitTransitionProperty +webkitTransitionTimingFunction webkitUserDrag webkitUserModify +webkitUserSelect webkitWritingMode whiteSpace widows Modified: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.Chrome.txt =================================================================== --- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.Chrome.txt 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.Chrome.txt 2018-07-28 15:41:38 UTC (rev 15496) @@ -292,8 +292,24 @@ vectorEffect=:none verticalAlign=:baseline visibility=:visible +webkitAlignContent=:normal +webkitAlignItems=:normal +webkitAlignSelf=:auto +webkitAnimation=:none 0s ease 0s 1 normal none running +webkitAnimationDelay=:0s +webkitAnimationDirection=:normal +webkitAnimationDuration=:0s +webkitAnimationFillMode=:none +webkitAnimationIterationCount=:1 +webkitAnimationName=:none +webkitAnimationPlayState=:running +webkitAnimationTimingFunction=:ease webkitAppRegion=:none webkitAppearance=:none +webkitBackfaceVisibility=:visible +webkitBackgroundClip=:border-box +webkitBackgroundOrigin=:padding-box +webkitBackgroundSize=:auto webkitBorderAfter=:0px none rgb(0, 0, 0) webkitBorderAfterColor=:rgb(0, 0, 0) webkitBorderAfterStyle=:none @@ -302,6 +318,8 @@ webkitBorderBeforeColor=:rgb(0, 0, 0) webkitBorderBeforeStyle=:none webkitBorderBeforeWidth=:0px +webkitBorderBottomLeftRadius=:0px +webkitBorderBottomRightRadius=:0px webkitBorderEnd=:0px none rgb(0, 0, 0) webkitBorderEndColor=:rgb(0, 0, 0) webkitBorderEndStyle=:none @@ -308,10 +326,13 @@ webkitBorderEndWidth=:0px webkitBorderHorizontalSpacing=:0px webkitBorderImage=:none +webkitBorderRadius=:0px webkitBorderStart=:0px none rgb(0, 0, 0) webkitBorderStartColor=:rgb(0, 0, 0) webkitBorderStartStyle=:none webkitBorderStartWidth=:0px +webkitBorderTopLeftRadius=:0px +webkitBorderTopRightRadius=:0px webkitBorderVerticalSpacing=:0px webkitBoxAlign=:stretch webkitBoxDecorationBreak=:slice @@ -321,13 +342,35 @@ webkitBoxOrient=:horizontal webkitBoxPack=:start webkitBoxReflect=:none +webkitBoxShadow=:none +webkitBoxSizing=:content-box +webkitClipPath=:none webkitColumnBreakAfter=:auto webkitColumnBreakBefore=:auto webkitColumnBreakInside=:auto +webkitColumnCount=:auto +webkitColumnGap=:normal +webkitColumnRule=:0px none rgb(0, 0, 0) +webkitColumnRuleColor=:rgb(0, 0, 0) +webkitColumnRuleStyle=:none +webkitColumnRuleWidth=:0px +webkitColumnSpan=:none +webkitColumnWidth=:auto +webkitColumns=:auto auto +webkitFilter=:none +webkitFlex=:0 1 auto +webkitFlexBasis=:auto +webkitFlexDirection=:row +webkitFlexFlow=:row nowrap +webkitFlexGrow=:0 +webkitFlexShrink=:1 +webkitFlexWrap=:nowrap +webkitFontFeatureSettings=:normal webkitFontSizeDelta=: webkitFontSmoothing=:auto webkitHighlight=:none webkitHyphenateCharacter=:auto +webkitJustifyContent=:normal webkitLineBreak=:auto webkitLineClamp=:none webkitLocale=:auto @@ -364,15 +407,22 @@ webkitMaxLogicalWidth=:none webkitMinLogicalHeight=:0px webkitMinLogicalWidth=:0px +webkitOpacity=:1 +webkitOrder=:0 webkitPaddingAfter=:0px webkitPaddingBefore=:0px webkitPaddingEnd=:0px webkitPaddingStart=:0px +webkitPerspective=:none +webkitPerspectiveOrigin=:456.5px 161px webkitPerspectiveOriginX=: webkitPerspectiveOriginY=: webkitPrintColorAdjust=:economy webkitRtlOrdering=:logical webkitRubyPosition=:before +webkitShapeImageThreshold=:0 +webkitShapeMargin=:0px +webkitShapeOutside=:none webkitTapHighlightColor=:rgba(0, 0, 0, 0.18) webkitTextCombine=:none webkitTextDecorationsInEffect=:none @@ -383,14 +433,24 @@ webkitTextFillColor=:rgb(0, 0, 0) webkitTextOrientation=:vertical-right webkitTextSecurity=:none +webkitTextSizeAdjust=:auto webkitTextStroke=: webkitTextStrokeColor=:rgb(0, 0, 0) webkitTextStrokeWidth=:0px +webkitTransform=:none +webkitTransformOrigin=:620px 161px webkitTransformOriginX=: webkitTransformOriginY=: webkitTransformOriginZ=: +webkitTransformStyle=:flat +webkitTransition=:all 0s ease 0s +webkitTransitionDelay=:0s +webkitTransitionDuration=:0s +webkitTransitionProperty=:all +webkitTransitionTimingFunction=:ease webkitUserDrag=:auto webkitUserModify=:read-only +webkitUserSelect=:auto webkitWritingMode=:horizontal-tb whiteSpace=:normal widows=:2 Modified: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.notAttached.Chrome.txt =================================================================== --- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.notAttached.Chrome.txt 2018-07-25 17:38:50 UTC (rev 15495) +++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.notAttached.Chrome.txt 2018-07-28 15:41:38 UTC (rev 15496) @@ -292,8 +292,24 @@ vectorEffect=: verticalAlign=: visibility=: +webkitAlignContent=: +webkitAlignItems=: +webkitAlignSelf=: +webkitAnimation=: +webkitAnimationDelay=: +webkitAnimationDirection=: +webkitAnimationDuration=: +webkitAnimationFillMode=: +webkitAnimationIterationCount=: +webkitAnimationName=: +webkitAnimationPlayState=: +webkitAnimationTimingFunction=: webkitAppRegion=: webkitAppearance=: +webkitBackfaceVisibility=: +webkitBackgroundClip=: +webkitBackgroundOrigin=: +webkitBackgroundSize=: webkitBorderAfter=: webkitBorderAfterColor=: webkitBorderAfterStyle=: @@ -302,6 +318,8 @@ webkitBorderBeforeColor=: webkitBorderBeforeStyle=: webkitBorderBeforeWidth=: +webkitBorderBottomLeftRadius=: +webkitBorderBottomRightRadius=: webkitBorderEnd=: webkitBorderEndColor=: webkitBorderEndStyle=: @@ -308,10 +326,13 @@ webkitBorderEndWidth=: webkitBorderHorizontalSpacing=: webkitBorderImage=: +webkitBorderRadius=: webkitBorderStart=: webkitBorderStartColor=: webkitBorderStartStyle=: webkitBorderStartWidth=: +webkitBorderTopLeftRadius=: +webkitBorderTopRightRadius=: webkitBorderVerticalSpacing=: webkitBoxAlign=: webkitBoxDecorationBreak=: @@ -321,13 +342,35 @@ webkitBoxOrient=: webkitBoxPack=: webkitBoxReflect=: +webkitBoxShadow=: +webkitBoxSizing=: +webkitClipPath=: webkitColumnBreakAfter=: webkitColumnBreakBefore=: webkitColumnBreakInside=: +webkitColumnCount=: +webkitColumnGap=: +webkitColumnRule=: +webkitColumnRuleColor=: +webkitColumnRuleStyle=: +webkitColumnRuleWidth=: +webkitColumnSpan=: +webkitColumnWidth=: +webkitColumns=: +webkitFilter=: +webkitFlex=: +webkitFlexBasis=: +webkitFlexDirection=: +webkitFlexFlow=: +webkitFlexGrow=: +webkitFlexShrink=: +webkitFlexWrap=: +webk... [truncated message content] |