Skip to content

Commit 6e9a55e

Browse files
rbrirbri
committed
cleanup
1 parent 5f458fd commit 6e9a55e

File tree

6 files changed

+83
-54
lines changed

6 files changed

+83
-54
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,10 @@ 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("328px"),
342-
ff("328.5px")),
341+
BLOCK_SIZE("blockSize", "block-size", chromeAndEdgeAndFirefox("auto")),
343342

344343
/** The style property {@code block-size}. */
345-
BLOCK_SIZE_("block-size", "block-size", ff("328.5px")),
344+
BLOCK_SIZE_("block-size", "block-size", ff("auto")),
346345

347346
/** The style property {@code border}. */
348347
BORDER("border", "border", chromeAndEdge("0px none rgb(0, 0, 0)"), ff("0px rgb(0, 0, 0)")),

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

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,8 @@ public void cssFloat() throws Exception {
104104
public void stringProperties() throws Exception {
105105
final String html = DOCTYPE_HTML
106106
+ "<html><head><body>\n"
107-
+ " <div id='myDiv'><br>\n"
107+
+ " <div id='myDiv'>HtmlUnit</div>\n"
108108
+ " <textarea id='myTextarea' cols='120' rows='20'></textarea>\n"
109-
+ " </div>\n"
110109
+ "<script>\n"
111110
+ "var e = document.getElementById('myDiv');\n"
112111
+ "var array = [];\n"
@@ -140,9 +139,8 @@ public void stringProperties() throws Exception {
140139
public void stringPropertiesDisplayNone() throws Exception {
141140
final String html = DOCTYPE_HTML
142141
+ "<html><head><body>\n"
143-
+ " <div id='myDiv' style='display: none'><br>\n"
142+
+ " <div id='myDiv' style='display: none'>HtmlUnit</div>\n"
144143
+ " <textarea id='myTextarea' cols='120' rows='20'></textarea>\n"
145-
+ " </div>\n"
146144
+ "<script>\n"
147145
+ "var e = document.getElementById('myDiv');\n"
148146
+ "var array = [];\n"
@@ -178,7 +176,6 @@ public void stringPropertiesNotAttached() throws Exception {
178176
final String html = DOCTYPE_HTML
179177
+ "<html><head><body>\n"
180178
+ " <textarea id='myTextarea' cols='120' rows='20'></textarea>\n"
181-
+ " </div>\n"
182179
+ "<script>\n"
183180
+ "var e = document.createElement('div');\n"
184181
+ "var array = [];\n"
@@ -3225,4 +3222,37 @@ public void animationDuration() throws Exception {
32253222

32263223
loadPageVerifyTitle2(html);
32273224
}
3225+
3226+
3227+
/**
3228+
* @throws Exception if the test fails
3229+
*/
3230+
@Test
3231+
@Alerts({"0px", "0px", "auto", "auto"})
3232+
public void blockSize() throws Exception {
3233+
final String html = DOCTYPE_HTML
3234+
+ "<html>\n"
3235+
+ "<head>\n"
3236+
+ "<script>\n"
3237+
+ LOG_TITLE_FUNCTION
3238+
+ " function test() {\n"
3239+
+ " var d = document.getElementById('myDiv');\n"
3240+
+ " var style = window.getComputedStyle(d, null);\n"
3241+
+ " log(style['blockSize']);\n"
3242+
+ " log(style.blockSize);\n"
3243+
3244+
+ " d = document.getElementById('myDivNone');\n"
3245+
+ " var style = window.getComputedStyle(d, null);\n"
3246+
+ " log(style['blockSize']);\n"
3247+
+ " log(style.blockSize);\n"
3248+
+ " }\n"
3249+
+ "</script>\n"
3250+
+ "</head>\n"
3251+
+ "<body onload='test()'>\n"
3252+
+ " <div id='myDiv'></div>\n"
3253+
+ " <div id='myDivNone' style='display: none'><br>\n"
3254+
+ "</body></html>";
3255+
3256+
loadPageVerifyTitle2(html);
3257+
}
32283258
}

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

Lines changed: 7 additions & 7 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=:328px
45+
blockSize=:18px
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=:328px
222+
height=:18px
223223
hyphenateCharacter=:auto
224224
hyphenateLimitChars=:auto
225225
hyphens=:manual
@@ -342,7 +342,7 @@ pageBreakInside=:auto
342342
pageOrientation=:
343343
paintOrder=:normal
344344
perspective=:none
345-
perspectiveOrigin=:620px 164px
345+
perspectiveOrigin=:620px 9px
346346
placeContent=:normal
347347
placeItems=:normal
348348
placeSelf=:auto
@@ -461,7 +461,7 @@ top=:auto
461461
touchAction=:auto
462462
transform=:none
463463
transformBox=:view-box
464-
transformOrigin=:620px 164px
464+
transformOrigin=:620px 9px
465465
transformStyle=:flat
466466
transition=:all
467467
transitionBehavior=:normal
@@ -563,7 +563,7 @@ webkitJustifyContent=:normal
563563
webkitLineBreak=:auto
564564
webkitLineClamp=:none
565565
webkitLocale=:auto
566-
webkitLogicalHeight=:328px
566+
webkitLogicalHeight=:18px
567567
webkitLogicalWidth=:1240px
568568
webkitMarginAfter=:0px
569569
webkitMarginBefore=:0px
@@ -596,7 +596,7 @@ webkitPaddingBefore=:0px
596596
webkitPaddingEnd=:0px
597597
webkitPaddingStart=:0px
598598
webkitPerspective=:none
599-
webkitPerspectiveOrigin=:620px 164px
599+
webkitPerspectiveOrigin=:620px 9px
600600
webkitPerspectiveOriginX=:
601601
webkitPerspectiveOriginY=:
602602
webkitPrintColorAdjust=:economy
@@ -620,7 +620,7 @@ webkitTextStroke=:0px rgb(0, 0, 0)
620620
webkitTextStrokeColor=:rgb(0, 0, 0)
621621
webkitTextStrokeWidth=:0px
622622
webkitTransform=:none
623-
webkitTransformOrigin=:620px 164px
623+
webkitTransformOrigin=:620px 9px
624624
webkitTransformOriginX=:
625625
webkitTransformOriginY=:
626626
webkitTransformOriginZ=:

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

Lines changed: 7 additions & 7 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=:328px
45+
blockSize=:18px
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=:328px
222+
height=:18px
223223
hyphenateCharacter=:auto
224224
hyphenateLimitChars=:auto
225225
hyphens=:manual
@@ -342,7 +342,7 @@ pageBreakInside=:auto
342342
pageOrientation=:
343343
paintOrder=:normal
344344
perspective=:none
345-
perspectiveOrigin=:616px 164px
345+
perspectiveOrigin=:616px 9px
346346
placeContent=:normal
347347
placeItems=:normal
348348
placeSelf=:auto
@@ -461,7 +461,7 @@ top=:auto
461461
touchAction=:auto
462462
transform=:none
463463
transformBox=:view-box
464-
transformOrigin=:616px 164px
464+
transformOrigin=:616px 9px
465465
transformStyle=:flat
466466
transition=:all
467467
transitionBehavior=:normal
@@ -563,7 +563,7 @@ webkitJustifyContent=:normal
563563
webkitLineBreak=:auto
564564
webkitLineClamp=:none
565565
webkitLocale=:auto
566-
webkitLogicalHeight=:328px
566+
webkitLogicalHeight=:18px
567567
webkitLogicalWidth=:1232px
568568
webkitMarginAfter=:0px
569569
webkitMarginBefore=:0px
@@ -596,7 +596,7 @@ webkitPaddingBefore=:0px
596596
webkitPaddingEnd=:0px
597597
webkitPaddingStart=:0px
598598
webkitPerspective=:none
599-
webkitPerspectiveOrigin=:616px 164px
599+
webkitPerspectiveOrigin=:616px 9px
600600
webkitPerspectiveOriginX=:
601601
webkitPerspectiveOriginY=:
602602
webkitPrintColorAdjust=:economy
@@ -620,7 +620,7 @@ webkitTextStroke=:0px rgb(0, 0, 0)
620620
webkitTextStrokeColor=:rgb(0, 0, 0)
621621
webkitTextStrokeWidth=:0px
622622
webkitTransform=:none
623-
webkitTransformOrigin=:616px 164px
623+
webkitTransformOrigin=:616px 9px
624624
webkitTransformOriginX=:
625625
webkitTransformOriginY=:
626626
webkitTransformOriginZ=:

‎src/test/resources/org/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.properties.FF-ESR.txt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
-moz-padding-start=:0px
3737
-moz-tab-size=:8
3838
-moz-text-size-adjust=:auto
39-
-moz-transform-origin=:622px 164.25px
39+
-moz-transform-origin=:622px 9px
4040
-moz-transform=:none
4141
-moz-user-input=:auto
4242
-moz-user-modify=:read-only
@@ -95,15 +95,15 @@
9595
-webkit-mask-size=:auto
9696
-webkit-mask=:none
9797
-webkit-order=:0
98-
-webkit-perspective-origin=:622px 164.25px
98+
-webkit-perspective-origin=:622px 9px
9999
-webkit-perspective=:none
100100
-webkit-text-fill-color=:rgb(0, 0, 0)
101101
-webkit-text-security=:none
102102
-webkit-text-size-adjust=:auto
103103
-webkit-text-stroke-color=:rgb(0, 0, 0)
104104
-webkit-text-stroke-width=:0px
105105
-webkit-text-stroke=:0px rgb(0, 0, 0)
106-
-webkit-transform-origin=:622px 164.25px
106+
-webkit-transform-origin=:622px 9px
107107
-webkit-transform-style=:flat
108108
-webkit-transform=:none
109109
-webkit-transition-delay=:0s
@@ -151,7 +151,7 @@ MozPaddingStart=:0px
151151
MozTabSize=:8
152152
MozTextSizeAdjust=:auto
153153
MozTransform=:none
154-
MozTransformOrigin=:622px 164.25px
154+
MozTransformOrigin=:622px 9px
155155
MozUserInput=:auto
156156
MozUserModify=:read-only
157157
MozUserSelect=:auto
@@ -210,15 +210,15 @@ WebkitMaskRepeat=:repeat
210210
WebkitMaskSize=:auto
211211
WebkitOrder=:0
212212
WebkitPerspective=:none
213-
WebkitPerspectiveOrigin=:622px 164.25px
213+
WebkitPerspectiveOrigin=:622px 9px
214214
WebkitTextFillColor=:rgb(0, 0, 0)
215215
WebkitTextSecurity=:none
216216
WebkitTextSizeAdjust=:auto
217217
WebkitTextStroke=:0px rgb(0, 0, 0)
218218
WebkitTextStrokeColor=:rgb(0, 0, 0)
219219
WebkitTextStrokeWidth=:0px
220220
WebkitTransform=:none
221-
WebkitTransformOrigin=:622px 164.25px
221+
WebkitTransformOrigin=:622px 9px
222222
WebkitTransformStyle=:flat
223223
WebkitTransition=:all
224224
WebkitTransitionDelay=:0s
@@ -286,8 +286,8 @@ backgroundRepeat=:repeat
286286
backgroundSize=:auto
287287
baseline-source=:auto
288288
baselineSource=:auto
289-
block-size=:328.5px
290-
blockSize=:328.5px
289+
block-size=:18px
290+
blockSize=:18px
291291
border-block-color=:rgb(0, 0, 0)
292292
border-block-end-color=:rgb(0, 0, 0)
293293
border-block-end-style=:none
@@ -608,7 +608,7 @@ gridTemplate=:none
608608
gridTemplateAreas=:none
609609
gridTemplateColumns=:none
610610
gridTemplateRows=:none
611-
height=:328.5px
611+
height=:18px
612612
hyphenate-character=:auto
613613
hyphenateCharacter=:auto
614614
hyphens=:manual
@@ -811,9 +811,9 @@ pageBreakBefore=:auto
811811
pageBreakInside=:auto
812812
paint-order=:normal
813813
paintOrder=:normal
814-
perspective-origin=:622px 164.25px
814+
perspective-origin=:622px 9px
815815
perspective=:none
816-
perspectiveOrigin=:622px 164.25px
816+
perspectiveOrigin=:622px 9px
817817
place-content=:normal
818818
place-items=:normal legacy
819819
place-self=:auto
@@ -984,11 +984,11 @@ top=:auto
984984
touch-action=:auto
985985
touchAction=:auto
986986
transform-box=:view-box
987-
transform-origin=:622px 164.25px
987+
transform-origin=:622px 9px
988988
transform-style=:flat
989989
transform=:none
990990
transformBox=:view-box
991-
transformOrigin=:622px 164.25px
991+
transformOrigin=:622px 9px
992992
transformStyle=:flat
993993
transition-delay=:0s
994994
transition-duration=:0s
@@ -1063,15 +1063,15 @@ webkitMaskRepeat=:repeat
10631063
webkitMaskSize=:auto
10641064
webkitOrder=:0
10651065
webkitPerspective=:none
1066-
webkitPerspectiveOrigin=:622px 164.25px
1066+
webkitPerspectiveOrigin=:622px 9px
10671067
webkitTextFillColor=:rgb(0, 0, 0)
10681068
webkitTextSecurity=:none
10691069
webkitTextSizeAdjust=:auto
10701070
webkitTextStroke=:0px rgb(0, 0, 0)
10711071
webkitTextStrokeColor=:rgb(0, 0, 0)
10721072
webkitTextStrokeWidth=:0px
10731073
webkitTransform=:none
1074-
webkitTransformOrigin=:622px 164.25px
1074+
webkitTransformOrigin=:622px 9px
10751075
webkitTransformStyle=:flat
10761076
webkitTransition=:all
10771077
webkitTransitionDelay=:0s

0 commit comments

Comments
 (0)