Skip to content

Commit a1efe78

Browse files
committed
Chrome/Edge 135: Style properties 'interactivity', 'overflowBlock', 'overflowInline', and 'scrollMarkerGroup' added
1 parent 0de6f44 commit a1efe78

15 files changed

+182
-136
lines changed

src/changes/changes.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
<body>
1010
<release version="4.12.0" date="April xx, 2025" description="Chrome/Edge 135, Firefox 137, Rhino RegExp, Bugfixes">
11+
<action type="add" dev="rbri">
12+
Chrome/Edge 135: Style properties 'interactivity', 'overflowBlock', 'overflowInline', and 'scrollMarkerGroup' added.
13+
</action>
1114
<action type="update" dev="rbri">
1215
FF137: Adjust clientHeight for some ruby related tags.
1316
</action>

src/main/java/org/htmlunit/css/StyleAttributes.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ public enum Definition {
338338
BASELINE_SOURCE_("baseline-source", "baseline-source", ff("auto")),
339339

340340
/** The style property {@code blockSize}. */
341-
BLOCK_SIZE("blockSize", "block-size", chromeAndEdge("324px"), ff("328px")),
341+
BLOCK_SIZE("blockSize", "block-size", chromeAndEdgeAndFirefox("328px")),
342342

343343
/** The style property {@code block-size}. */
344344
BLOCK_SIZE_("block-size", "block-size", ff("328px")),
@@ -1505,6 +1505,9 @@ public enum Definition {
15051505
/** The style property {@code inset-inline-start}. */
15061506
INSET_INLINE_START_("inset-inline-start", "inset-inline-start", ff("auto")),
15071507

1508+
/** The style property {@code interactivity}. */
1509+
INTERACTIVITY("interactivity", "interpolate-size", chromeAndEdge("auto")),
1510+
15081511
/** The style property {@code interpolateSize}. */
15091512
INTERPOLATE_SIZE("interpolateSize", "interpolate-size", chromeAndEdge("numeric-only")),
15101513

@@ -2257,7 +2260,7 @@ public enum Definition {
22572260
OVERFLOW_ANCHOR_("overflow-anchor", "overflow-anchor", ff("auto")),
22582261

22592262
/** The style property {@code overflowBlock}. */
2260-
OVERFLOW_BLOCK("overflowBlock", "overflow-block", ff("visible")),
2263+
OVERFLOW_BLOCK("overflowBlock", "overflow-block", chromeAndEdgeAndFirefox("visible")),
22612264

22622265
/** The style property {@code overflow-block}. */
22632266
OVERFLOW_BLOCK_("overflow-block", "overflow-block", ff("visible")),
@@ -2269,7 +2272,7 @@ public enum Definition {
22692272
OVERFLOW_CLIP_MARGIN_("overflow-clip-margin", "overflow-clip-margin", ff("0px")),
22702273

22712274
/** The style property {@code overflowInline}. */
2272-
OVERFLOW_INLINE("overflowInline", "overflow-inline", ff("visible")),
2275+
OVERFLOW_INLINE("overflowInline", "overflow-inline", chromeAndEdgeAndFirefox("visible")),
22732276

22742277
/** The style property {@code overflow-inline}. */
22752278
OVERFLOW_INLINE_("overflow-inline", "overflow-inline", ff("visible")),
@@ -2433,7 +2436,7 @@ public enum Definition {
24332436

24342437
/** The style property {@code perspectiveOrigin}. */
24352438
PERSPECTIVE_ORIGIN("perspectiveOrigin", "perspective-origin",
2436-
ffEsr("622px 164px"), ffLatest("620px 164px"), chrome("620px 162px"), edge("616px 162px")),
2439+
ffEsr("622px 164px"), ffLatest("620px 164px"), chrome("620px 164px"), edge("616px 162px")),
24372440

24382441
/** The style property {@code perspective-origin}. */
24392442
PERSPECTIVE_ORIGIN_("perspective-origin", "perspective-origin", ffEsr("622px 164px"), ffLatest("620px 164px")),
@@ -2619,6 +2622,9 @@ public enum Definition {
26192622
/** The style property {@code scroll-margin-top}. */
26202623
SCROLL_MARGIN_TOP_("scroll-margin-top", "scroll-margin-top", ff("0px")),
26212624

2625+
/** The style property {@code scrollMarkerGroup}. */
2626+
SCROLL_MARKER_GROUP("scrollMarkerGroup", "scroll-marker-group", chromeAndEdgeNone()),
2627+
26222628
/** The style property {@code scrollPadding}. */
26232629
SCROLL_PADDING("scrollPadding", "scroll-padding", chromeAndEdgeAuto(), ff("auto")),
26242630

@@ -3062,7 +3068,7 @@ public enum Definition {
30623068

30633069
/** The style property {@code transformOrigin}. */
30643070
TRANSFORM_ORIGIN("transformOrigin", "transform-origin",
3065-
ffEsr("622px 164px"), ffLatest("620px 164px"), chrome("620px 162px"), edge("616px 162px")),
3071+
ffEsr("622px 164px"), ffLatest("620px 164px"), chrome("620px 164px"), edge("616px 162px")),
30663072

30673073
/** The style property {@code transform-origin}. */
30683074
TRANSFORM_ORIGIN_("transform-origin", "transform-origin", ffEsr("622px 164px"), ffLatest("620px 164px")),
@@ -3706,7 +3712,7 @@ public enum Definition {
37063712
WEBKIT_LOCALE("webkitLocale", "webkit-locale", chromeAndEdgeAuto()),
37073713

37083714
/** The style property {@code webkitLogicalHeight}. */
3709-
WEBKIT_LOGICAL_HEIGHT("webkitLogicalHeight", "webkit-logical-height", chromeAndEdge("324px")),
3715+
WEBKIT_LOGICAL_HEIGHT("webkitLogicalHeight", "webkit-logical-height", chromeAndEdge("328px")),
37103716

37113717
/** The style property {@code webkitLogicalWidth}. */
37123718
WEBKIT_LOGICAL_WIDTH("webkitLogicalWidth", "webkit-logical-width", chrome("1240px"), edge("1232px")),
@@ -3879,7 +3885,7 @@ public enum Definition {
38793885

38803886
/** The style property {@code webkitPerspectiveOrigin}. */
38813887
WEBKIT_PERSPECTIVE_ORIGIN("webkitPerspectiveOrigin", "webkit-perspective-origin",
3882-
ffEsr("622px 164px"), ffLatest("620px 164px"), chrome("620px 162px"), edge("616px 162px")),
3888+
ffEsr("622px 164px"), ffLatest("620px 164px"), chrome("620px 164px"), edge("616px 162px")),
38833889

38843890
/** The style property {@code WebkitPerspectiveOrigin}. */
38853891
WEBKIT_PERSPECTIVE_ORIGIN_("WebkitPerspectiveOrigin", "webkit-perspective-origin",
@@ -4013,7 +4019,7 @@ public enum Definition {
40134019

40144020
/** The style property {@code webkitTransformOrigin}. */
40154021
WEBKIT_TRANSFORM_ORIGIN("webkitTransformOrigin", "webkit-transform-origin",
4016-
ffEsr("622px 164px"), ffLatest("620px 164px"), chrome("620px 162px"), edge("616px 162px")),
4022+
ffEsr("622px 164px"), ffLatest("620px 164px"), chrome("620px 164px"), edge("616px 162px")),
40174023

40184024
/** The style property {@code WebkitTransformOrigin}. */
40194025
WEBKIT_TRANSFORM_ORIGIN_("WebkitTransformOrigin", "webkit-transform-origin",

src/test/java/org/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ public void fontSizeEM() throws Exception {
11741174
@Test
11751175
@Alerts(DEFAULT = "4.05px",
11761176
CHROME = "3.726px",
1177-
EDGE = "3.792px")
1177+
EDGE = "3.78px")
11781178
@HtmlUnitNYI(CHROME = "1px",
11791179
EDGE = "1px",
11801180
FF = "1px",
@@ -1203,9 +1203,10 @@ public void fontSizeVH() throws Exception {
12031203
* @throws Exception if an error occurs
12041204
*/
12051205
@Test
1206-
@Alerts(DEFAULT = "7.55px",
1207-
CHROME = "7.536px",
1208-
EDGE = "7.248px")
1206+
@Alerts(CHROME = "7.536px",
1207+
EDGE = "7.488px",
1208+
FF = "7.53333px",
1209+
FF_ESR = "7.55px")
12091210
@HtmlUnitNYI(CHROME = "1px",
12101211
EDGE = "1px",
12111212
FF = "1px",
@@ -1511,7 +1512,8 @@ public void widthAndHeightEmptySpanElement() throws Exception {
15111512
* @throws Exception if an error occurs
15121513
*/
15131514
@Test
1514-
@Alerts({"0", "0", "0", "0", "0", "0"})
1515+
@Alerts(DEFAULT = {"0", "0", "0", "0", "0", "0"},
1516+
FF_ESR = {"0", "0", "0", "0", "0", "17"})
15151517
public void widthAndHeightScriptElement() throws Exception {
15161518
final String content = DOCTYPE_HTML
15171519
+ "<html><head><script id='headScript'>\n"
@@ -1541,9 +1543,7 @@ public void widthAndHeightScriptElement() throws Exception {
15411543
* @throws Exception if an error occurs
15421544
*/
15431545
@Test
1544-
@Alerts(DEFAULT = {"33", "17", "0", "17"},
1545-
FF = {"33", "17", "0", "0"},
1546-
FF_ESR = {"33", "17", "0", "0"})
1546+
@Alerts({"33", "17", "0", "17"})
15471547
@HtmlUnitNYI(CHROME = {"30", "18", "0", "0"},
15481548
EDGE = {"30", "18", "0", "0"},
15491549
FF = {"30", "18", "0", "0"},
@@ -1573,7 +1573,8 @@ public void widthAndHeightChildDisplayNone() throws Exception {
15731573
* @throws Exception if an error occurs
15741574
*/
15751575
@Test
1576-
@Alerts({"0", "0"})
1576+
@Alerts(DEFAULT = {"0", "0"},
1577+
FF_ESR = {"0", "17"})
15771578
public void widthAndHeightChildDisplayNoneWidth() throws Exception {
15781579
final String content = DOCTYPE_HTML
15791580
+ "<html><head><script>\n"
@@ -1594,7 +1595,8 @@ public void widthAndHeightChildDisplayNoneWidth() throws Exception {
15941595
* @throws Exception if an error occurs
15951596
*/
15961597
@Test
1597-
@Alerts({"0", "0"})
1598+
@Alerts(DEFAULT = {"0", "0"},
1599+
FF_ESR = {"0", "17"})
15981600
public void widthAndHeightChildDisplayNoneWidthLineBreak() throws Exception {
15991601
//see https://github.com/HtmlUnit/htmlunit/pull/356
16001602
final String content = DOCTYPE_HTML
@@ -1860,7 +1862,7 @@ public void offsetHeight_with_child() throws Exception {
18601862
* @throws Exception if the test fails
18611863
*/
18621864
@Test
1863-
@Alerts("81")
1865+
@Alerts("85")
18641866
@HtmlUnitNYI(CHROME = "18",
18651867
EDGE = "18",
18661868
FF = "18",
@@ -1884,7 +1886,7 @@ public void offsetHeight_with_childHeight() throws Exception {
18841886
* @throws Exception if the test fails
18851887
*/
18861888
@Test
1887-
@Alerts({"true", "false"})
1889+
@Alerts({"true", "true"})
18881890
public void offsetHeight_setting_height() throws Exception {
18891891
final String html = DOCTYPE_HTML
18901892
+ "<html><head>\n"
@@ -2645,6 +2647,7 @@ public void heightManyLines() throws Exception {
26452647
*/
26462648
@Test
26472649
@Alerts(DEFAULT = "0 17",
2650+
CHROME = "0 15",
26482651
EDGE = "0 15")
26492652
@HtmlUnitNYI(CHROME = "0 0",
26502653
EDGE = "0 0",

src/test/resources/org/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.Chrome.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ backgroundSize=:auto
4242
basePalette=:
4343
baselineShift=:0px
4444
baselineSource=:auto
45-
blockSize=:324px
45+
blockSize=:328px
4646
border=:0px none rgb(0, 0, 0)
4747
borderBlock=:0px none rgb(0, 0, 0)
4848
borderBlockColor=:rgb(0, 0, 0)
@@ -219,7 +219,7 @@ gridTemplate=:none
219219
gridTemplateAreas=:none
220220
gridTemplateColumns=:none
221221
gridTemplateRows=:none
222-
height=:49px
222+
height=:328px
223223
hyphenateCharacter=:auto
224224
hyphenateLimitChars=:auto
225225
hyphens=:manual
@@ -236,6 +236,7 @@ insetBlockStart=:auto
236236
insetInline=:auto
237237
insetInlineEnd=:auto
238238
insetInlineStart=:auto
239+
interactivity=:auto
239240
interpolateSize=:numeric-only
240241
isolation=:auto
241242
justifyContent=:normal
@@ -309,7 +310,9 @@ outlineStyle=:none
309310
outlineWidth=:0px
310311
overflow=:visible
311312
overflowAnchor=:auto
313+
overflowBlock=:visible
312314
overflowClipMargin=:0px
315+
overflowInline=:visible
313316
overflowWrap=:normal
314317
overflowX=:visible
315318
overflowY=:visible
@@ -339,7 +342,7 @@ pageBreakInside=:auto
339342
pageOrientation=:
340343
paintOrder=:normal
341344
perspective=:none
342-
perspectiveOrigin=:620px 162px
345+
perspectiveOrigin=:620px 164px
343346
placeContent=:normal
344347
placeItems=:normal
345348
placeSelf=:auto
@@ -377,6 +380,7 @@ scrollMarginInlineStart=:0px
377380
scrollMarginLeft=:0px
378381
scrollMarginRight=:0px
379382
scrollMarginTop=:0px
383+
scrollMarkerGroup=:none
380384
scrollPadding=:auto
381385
scrollPaddingBlock=:auto
382386
scrollPaddingBlockEnd=:auto
@@ -457,7 +461,7 @@ top=:auto
457461
touchAction=:auto
458462
transform=:none
459463
transformBox=:view-box
460-
transformOrigin=:620px 162px
464+
transformOrigin=:620px 164px
461465
transformStyle=:flat
462466
transition=:all
463467
transitionBehavior=:normal
@@ -559,7 +563,7 @@ webkitJustifyContent=:normal
559563
webkitLineBreak=:auto
560564
webkitLineClamp=:none
561565
webkitLocale=:auto
562-
webkitLogicalHeight=:324px
566+
webkitLogicalHeight=:328px
563567
webkitLogicalWidth=:1240px
564568
webkitMarginAfter=:0px
565569
webkitMarginBefore=:0px
@@ -592,7 +596,7 @@ webkitPaddingBefore=:0px
592596
webkitPaddingEnd=:0px
593597
webkitPaddingStart=:0px
594598
webkitPerspective=:none
595-
webkitPerspectiveOrigin=:620px 162px
599+
webkitPerspectiveOrigin=:620px 164px
596600
webkitPerspectiveOriginX=:
597601
webkitPerspectiveOriginY=:
598602
webkitPrintColorAdjust=:economy
@@ -616,7 +620,7 @@ webkitTextStroke=:0px rgb(0, 0, 0)
616620
webkitTextStrokeColor=:rgb(0, 0, 0)
617621
webkitTextStrokeWidth=:0px
618622
webkitTransform=:none
619-
webkitTransformOrigin=:620px 162px
623+
webkitTransformOrigin=:620px 164px
620624
webkitTransformOriginX=:
621625
webkitTransformOriginY=:
622626
webkitTransformOriginZ=:
@@ -633,7 +637,7 @@ webkitWritingMode=:horizontal-tb
633637
whiteSpace=:normal
634638
whiteSpaceCollapse=:collapse
635639
widows=:2
636-
width=:1256px
640+
width=:1240px
637641
willChange=:auto
638642
wordBreak=:normal
639643
wordSpacing=:0px

src/test/resources/org/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.Edge.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ backgroundSize=:auto
4242
basePalette=:
4343
baselineShift=:0px
4444
baselineSource=:auto
45-
blockSize=:324px
45+
blockSize=:328px
4646
border=:0px none rgb(0, 0, 0)
4747
borderBlock=:0px none rgb(0, 0, 0)
4848
borderBlockColor=:rgb(0, 0, 0)
@@ -219,7 +219,7 @@ gridTemplate=:none
219219
gridTemplateAreas=:none
220220
gridTemplateColumns=:none
221221
gridTemplateRows=:none
222-
height=:49px
222+
height=:328px
223223
hyphenateCharacter=:auto
224224
hyphenateLimitChars=:auto
225225
hyphens=:manual
@@ -236,6 +236,7 @@ insetBlockStart=:auto
236236
insetInline=:auto
237237
insetInlineEnd=:auto
238238
insetInlineStart=:auto
239+
interactivity=:auto
239240
interpolateSize=:numeric-only
240241
isolation=:auto
241242
justifyContent=:normal
@@ -309,7 +310,9 @@ outlineStyle=:none
309310
outlineWidth=:0px
310311
overflow=:visible
311312
overflowAnchor=:auto
313+
overflowBlock=:visible
312314
overflowClipMargin=:0px
315+
overflowInline=:visible
313316
overflowWrap=:normal
314317
overflowX=:visible
315318
overflowY=:visible
@@ -339,7 +342,7 @@ pageBreakInside=:auto
339342
pageOrientation=:
340343
paintOrder=:normal
341344
perspective=:none
342-
perspectiveOrigin=:616px 162px
345+
perspectiveOrigin=:616px 164px
343346
placeContent=:normal
344347
placeItems=:normal
345348
placeSelf=:auto
@@ -377,6 +380,7 @@ scrollMarginInlineStart=:0px
377380
scrollMarginLeft=:0px
378381
scrollMarginRight=:0px
379382
scrollMarginTop=:0px
383+
scrollMarkerGroup=:none
380384
scrollPadding=:auto
381385
scrollPaddingBlock=:auto
382386
scrollPaddingBlockEnd=:auto
@@ -457,7 +461,7 @@ top=:auto
457461
touchAction=:auto
458462
transform=:none
459463
transformBox=:view-box
460-
transformOrigin=:616px 162px
464+
transformOrigin=:616px 164px
461465
transformStyle=:flat
462466
transition=:all
463467
transitionBehavior=:normal
@@ -559,7 +563,7 @@ webkitJustifyContent=:normal
559563
webkitLineBreak=:auto
560564
webkitLineClamp=:none
561565
webkitLocale=:auto
562-
webkitLogicalHeight=:324px
566+
webkitLogicalHeight=:328px
563567
webkitLogicalWidth=:1232px
564568
webkitMarginAfter=:0px
565569
webkitMarginBefore=:0px
@@ -592,7 +596,7 @@ webkitPaddingBefore=:0px
592596
webkitPaddingEnd=:0px
593597
webkitPaddingStart=:0px
594598
webkitPerspective=:none
595-
webkitPerspectiveOrigin=:616px 162px
599+
webkitPerspectiveOrigin=:616px 164px
596600
webkitPerspectiveOriginX=:
597601
webkitPerspectiveOriginY=:
598602
webkitPrintColorAdjust=:economy
@@ -616,7 +620,7 @@ webkitTextStroke=:0px rgb(0, 0, 0)
616620
webkitTextStrokeColor=:rgb(0, 0, 0)
617621
webkitTextStrokeWidth=:0px
618622
webkitTransform=:none
619-
webkitTransformOrigin=:616px 162px
623+
webkitTransformOrigin=:616px 164px
620624
webkitTransformOriginX=:
621625
webkitTransformOriginY=:
622626
webkitTransformOriginZ=:
@@ -633,7 +637,7 @@ webkitWritingMode=:horizontal-tb
633637
whiteSpace=:normal
634638
whiteSpaceCollapse=:collapse
635639
widows=:2
636-
width=:1256px
640+
width=:1232px
637641
willChange=:auto
638642
wordBreak=:normal
639643
wordSpacing=:0px

0 commit comments

Comments
 (0)