From: <rb...@us...> - 2017-12-13 20:47:54
|
Revision: 15004 http://sourceforge.net/p/htmlunit/code/15004 Author: rbri Date: 2017-12-13 20:47:51 +0000 (Wed, 13 Dec 2017) Log Message: ----------- fixes for chrome 63 (wip) Modified Paths: -------------- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.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/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java 2017-12-13 20:22:54 UTC (rev 15003) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/StyleAttributes.java 2017-12-13 20:47:51 UTC (rev 15004) @@ -864,7 +864,7 @@ FLOOD_OPACITY_("flood-opacity", "flood-opacity", ff("1")), /** The style property {@code font}. */ - FONT("font", "font", chrome("normal normal normal normal 16px / normal \"Times New Roman\""), ff(""), ie("")), + FONT("font", "font", chrome("normal normal 400 normal 16px / normal \"Times New Roman\""), ff(""), ie("")), /** The style property {@code fontDisplay}. */ FONT_DISPLAY("fontDisplay", "font-display", chrome("")), @@ -907,7 +907,7 @@ FONT_SIZE_ADJUST_("font-size-adjust", "font-size-adjust", ff("none")), /** The style property {@code fontStretch}. */ - FONT_STRETCH("fontStretch", "font-stretch", chrome("normal"), ff("normal"), ie("normal")), + FONT_STRETCH("fontStretch", "font-stretch", chrome("100%"), ff("normal"), ie("normal")), /** The style property {@code font-stretch}. */ FONT_STRETCH_("font-stretch", "font-stretch", ff("normal")), @@ -966,8 +966,11 @@ /** The style property {@code font-variant-position}. */ FONT_VARIANT_POSITION_("font-variant-position", "font-variant-position", ff("normal")), + /** The style property {@code fontVariationSettings}. */ + FONT_VARIATION_SETTING("fontVariationSettings", "font-variation-settings", chrome("normal")), + /** The style property {@code fontWeight}. */ - FONT_WEIGHT("fontWeight", "font-weight", chrome("normal"), ff("400"), ie("400")), + FONT_WEIGHT("fontWeight", "font-weight", chrome("400"), ff("400"), ie("400")), /** The style property {@code font-weight}. */ FONT_WEIGHT_("font-weight", "font-weight", ff("400")), @@ -981,7 +984,7 @@ ie("auto")), /** The style property {@code grid}. */ - GRID("grid", "grid", chrome("none / none / none / row / auto / auto / 0px / 0px"), + GRID("grid", "grid", chrome("none / none / none / row / auto / auto"), ff52up("")), /** The style property {@code gridArea}. */ @@ -2273,6 +2276,15 @@ /** The style property {@code overflow-y}. */ OVERFLOW_Y_("overflow-y", "overflow-y", ff("visible")), + /** The style property {@code overscrollBehavior}. */ + OVERSCROLL_BEHAVIOR("overscrollBehavior", "overscroll-behavior", chrome("auto auto")), + + /** The style property {@code overscrollBehaviorX}. */ + OVERSCROLL_BEHAVIOR_X("overscrollBehaviorX", "overscroll-behavior_x", chrome("auto")), + + /** The style property {@code overscrollBehaviorY}. */ + OVERSCROLL_BEHAVIOR_Y("overscrollBehaviorY", "overscroll-behavior_y", chrome("auto")), + /** The style property {@code padding}. */ PADDING("padding", "padding", chrome("0px"), ff(""), ie("")), @@ -2875,7 +2887,7 @@ UNICODE_RANGE("unicodeRange", "unicode-range", chrome("")), /** The style property {@code userSelect}. */ - USER_SELECT("userSelect", "user-select", chrome("text")), + USER_SELECT("userSelect", "user-select", chrome("auto")), /** The style property {@code userZoom}. */ USER_ZOOM("userZoom", "user-zoom", chrome("")), @@ -3553,7 +3565,7 @@ /** The style property {@code webkitTextEmphasisPosition}. */ WEBKIT_TEXT_EMPHASIS_POSITION("webkitTextEmphasisPosition", "webkit-text-emphasis-position", - chrome("over")), + chrome("over right")), /** The style property {@code webkitTextEmphasisStyle}. */ WEBKIT_TEXT_EMPHASIS_STYLE("webkitTextEmphasisStyle", "webkit-text-emphasis-style", 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 2017-12-13 20:22:54 UTC (rev 15003) +++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties.Chrome.txt 2017-12-13 20:47:51 UTC (rev 15004) @@ -127,8 +127,10 @@ fontStyle fontVariant fontVariantCaps +fontVariantEastAsian fontVariantLigatures fontVariantNumeric +fontVariationSettings fontWeight grid gridArea @@ -208,6 +210,9 @@ overflowWrap overflowX overflowY +overscrollBehavior +overscrollBehaviorX +overscrollBehaviorY padding paddingBottom paddingLeft 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 2017-12-13 20:22:54 UTC (rev 15003) +++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties2.Chrome.txt 2017-12-13 20:47:51 UTC (rev 15004) @@ -127,8 +127,10 @@ fontStyle fontVariant fontVariantCaps +fontVariantEastAsian fontVariantLigatures fontVariantNumeric +fontVariationSettings fontWeight grid gridArea @@ -207,6 +209,9 @@ overflowWrap overflowX overflowY +overscrollBehavior +overscrollBehaviorX +overscrollBehaviorY padding paddingBottom paddingLeft 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 2017-12-13 20:22:54 UTC (rev 15003) +++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.Chrome.txt 2017-12-13 20:47:51 UTC (rev 15004) @@ -117,20 +117,22 @@ float=:none floodColor=:rgb(0, 0, 0) floodOpacity=:1 -font=:normal normal normal normal 16px / normal "Times New Roman" +font=:normal normal 400 normal 16px / normal "Times New Roman" fontDisplay=: fontFamily=:"Times New Roman" fontFeatureSettings=:normal fontKerning=:auto fontSize=:16px -fontStretch=:normal +fontStretch=:100% fontStyle=:normal fontVariant=:normal fontVariantCaps=:normal +fontVariantEastAsian=:normal fontVariantLigatures=:normal fontVariantNumeric=:normal -fontWeight=:normal -grid=:none / none / none / row / auto / auto / 0px / 0px +fontVariationSettings=:normal +fontWeight=:400 +grid=:none / none / none / row / auto / auto gridArea=:auto / auto / auto / auto gridAutoColumns=:auto gridAutoFlow=:row @@ -207,6 +209,9 @@ overflowWrap=:normal overflowX=:visible overflowY=:visible +overscrollBehavior=:auto auto +overscrollBehaviorX=:auto +overscrollBehaviorY=:auto padding=:0px paddingBottom=:0px paddingLeft=:0px @@ -279,7 +284,7 @@ transitionTimingFunction=:ease unicodeBidi=:normal unicodeRange=: -userSelect=:text +userSelect=:auto userZoom=: vectorEffect=:none verticalAlign=:baseline @@ -374,7 +379,7 @@ webkitTextDecorationsInEffect=:none webkitTextEmphasis=: webkitTextEmphasisColor=:rgb(0, 0, 0) -webkitTextEmphasisPosition=:over +webkitTextEmphasisPosition=:over right webkitTextEmphasisStyle=:none webkitTextFillColor=:rgb(0, 0, 0) webkitTextOrientation=:vertical-right 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 2017-12-13 20:22:54 UTC (rev 15003) +++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.notAttached.Chrome.txt 2017-12-13 20:47:51 UTC (rev 15004) @@ -127,8 +127,10 @@ fontStyle=: fontVariant=: fontVariantCaps=: +fontVariantEastAsian=: fontVariantLigatures=: fontVariantNumeric=: +fontVariationSettings=: fontWeight=: grid=: gridArea=: @@ -207,6 +209,9 @@ overflowWrap=: overflowX=: overflowY=: +overscrollBehavior=: +overscrollBehaviorX=: +overscrollBehaviorY=: padding=: paddingBottom=: paddingLeft=: |