Skip to content

Commit f394c6e

Browse files
committed
FF 144
1 parent f822122 commit f394c6e

13 files changed

Lines changed: 47 additions & 12 deletions

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3265,13 +3265,19 @@ public enum Definition {
32653265
VIEW_TIMELINE_NAME("viewTimelineName", "view-timeline-name", chromeAndEdgeNone()),
32663266

32673267
/** The style property {@code viewTransitionClass}. */
3268-
VIEW_TRANSITION_CLASS("viewTransitionClass", "view-transition-class", chromeAndEdgeNone()),
3268+
VIEW_TRANSITION_CLASS("viewTransitionClass", "view-transition-class", chromeAndEdgeNone(), ffLatest("none")),
3269+
3270+
/** The style property {@code view-transition-class}. */
3271+
VIEW_TRANSITION_CLASS_("view-transition-class", "view-transition-class", ffLatest("none")),
32693272

32703273
/** The style property {@code viewTransitionGroup}. */
32713274
VIEW_TRANSITION_GROUP("viewTransitionGroup", "view-transition-group", chromeAndEdgeNormal()),
32723275

32733276
/** The style property {@code viewTransitionName}. */
3274-
VIEW_TRANSITION_NAME("viewTransitionName", "view-transition-name", chromeAndEdgeNone()),
3277+
VIEW_TRANSITION_NAME("viewTransitionName", "view-transition-name", chromeAndEdgeNone(), ffLatest("none")),
3278+
3279+
/** The style property {@code view-transition-name}. */
3280+
VIEW_TRANSITION_NAME_("view-transition-name", "view-transition-name", ffLatest("none")),
32753281

32763282
/** The style property {@code visibility}. */
32773283
VISIBILITY("visibility", "visibility", chromeAndEdge("visible"), ff("visible")),

src/main/java/org/htmlunit/html/HtmlPage.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2654,7 +2654,7 @@ public void clearComputedStylesUpToRoot(final DomElement element) {
26542654
*
26552655
* @param element the element to clear its cache
26562656
* @param normalizedPseudo the pseudo attribute
2657-
* @return the cached CSS2Properties object or null
2657+
* @return the cached ComputedCssStyleDeclaration object or null
26582658
*/
26592659
public ComputedCssStyleDeclaration getStyleFromCache(final DomElement element,
26602660
final String normalizedPseudo) {
@@ -2664,10 +2664,10 @@ public ComputedCssStyleDeclaration getStyleFromCache(final DomElement element,
26642664
/**
26652665
* <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br>
26662666
*
2667-
* Caches a CSS2Properties object.
2667+
* Caches a ComputedCssStyleDeclaration object.
26682668
* @param element the element to clear its cache
26692669
* @param normalizedPseudo the pseudo attribute
2670-
* @param style the CSS2Properties to cache
2670+
* @param style the ComputedCssStyleDeclaration to cache
26712671
*/
26722672
public void putStyleIntoCache(final DomElement element, final String normalizedPseudo,
26732673
final ComputedCssStyleDeclaration style) {

src/main/java/org/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.htmlunit.corejs.javascript.SymbolKey;
3636
import org.htmlunit.javascript.HtmlUnitScriptable;
3737
import org.htmlunit.javascript.JavaScriptEngine;
38+
import org.htmlunit.util.StringUtils;
3839

3940
/**
4041
* An abstract container for all the JavaScript configuration information.
@@ -342,7 +343,7 @@ else if (annotation instanceof JsxConstructorAlias) {
342343
final JsxSymbolConstant jsxSymbolConstant = (JsxSymbolConstant) annotation;
343344
if (isSupported(jsxSymbolConstant.value(), expectedBrowser)) {
344345
final SymbolKey symbolKey;
345-
if ("TO_STRING_TAG".equalsIgnoreCase(field.getName())) {
346+
if (StringUtils.startsWithIgnoreCase(field.getName(), "TO_STRING_TAG")) {
346347
symbolKey = SymbolKey.TO_STRING_TAG;
347348
}
348349
else {

src/main/java/org/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,12 @@
4444
public class ComputedCSSStyleDeclaration extends CSSStyleDeclaration {
4545

4646
/** Symbol.toStringTag support. */
47-
@JsxSymbolConstant({FF, FF_ESR})
48-
public static final String TO_STRING_TAG = "CSS2Properties";
47+
@JsxSymbolConstant(FF)
48+
public static final String TO_STRING_TAG_FF = "CSSStyleProperties";
49+
50+
/** Symbol.toStringTag support. */
51+
@JsxSymbolConstant(FF_ESR)
52+
public static final String TO_STRING_TAG_FF_ESR = "CSS2Properties";
4953

5054
/**
5155
* Creates an instance.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public class CSSStyleDeclarationTest extends WebDriverTestCase {
5757
@Test
5858
@Alerts(DEFAULT = {"[object CSSStyleDeclaration]", "[object CSSStyleDeclaration]",
5959
"[object CSSStyleDeclaration]", "[object CSSStyleDeclaration]"},
60-
FF = {"[object CSS2Properties]", "[object CSS2Properties]",
61-
"[object CSS2Properties]", "[object CSS2Properties]"},
60+
FF = {"[object CSSStyleProperties]", "[object CSSStyleProperties]",
61+
"[object CSSStyleProperties]", "[object CSSStyleProperties]"},
6262
FF_ESR = {"[object CSS2Properties]", "[object CSS2Properties]",
6363
"[object CSS2Properties]", "[object CSS2Properties]"})
6464
@HtmlUnitNYI(FF = {"[object CSSStyleDeclaration]", "[object CSSStyleDeclaration]",
@@ -3472,7 +3472,7 @@ public void position() throws Exception {
34723472
*/
34733473
@Test
34743474
@Alerts(DEFAULT = {"[object CSSStyleDeclaration]", "[object CSSStyleDeclaration]", "green", "abc"},
3475-
FF = {"[object CSS2Properties]", "[object CSS2Properties]", "green", "abc"},
3475+
FF = {"[object CSSStyleProperties]", "[object CSSStyleProperties]", "green", "abc"},
34763476
FF_ESR = {"[object CSS2Properties]", "[object CSS2Properties]", "green", "abc"})
34773477
@HtmlUnitNYI(FF = {"[object CSSStyleDeclaration]", "[object CSSStyleDeclaration]", "green", "abc"},
34783478
FF_ESR = {"[object CSSStyleDeclaration]", "[object CSSStyleDeclaration]", "green", "abc"})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class ComputedCSSStyleDeclarationTest extends WebDriverTestCase {
4343
*/
4444
@Test
4545
@Alerts(DEFAULT = {"[object CSSStyleDeclaration]", "[object CSSStyleDeclaration]"},
46-
FF = {"[object CSS2Properties]", "[object CSS2Properties]"},
46+
FF = {"[object CSSStyleProperties]", "[object CSSStyleProperties]"},
4747
FF_ESR = {"[object CSS2Properties]", "[object CSS2Properties]"})
4848
public void scriptableToString() throws Exception {
4949
final String html = DOCTYPE_HTML

src/test/resources/org/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties.FF.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,8 @@ unicodeBidi
544544
userSelect
545545
vectorEffect
546546
verticalAlign
547+
viewTransitionClass
548+
viewTransitionName
547549
visibility
548550
webkitAlignContent
549551
webkitAlignItems

src/test/resources/org/htmlunit/javascript/host/css/CSSStyleDeclaration2Test.properties2.FF.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,8 @@ unicodeBidi
541541
userSelect
542542
vectorEffect
543543
verticalAlign
544+
viewTransitionClass
545+
viewTransitionName
544546
visibility
545547
webkitAlignContent
546548
webkitAlignItems

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,10 @@ vector-effect=:none
10261026
vectorEffect=:none
10271027
vertical-align=:baseline
10281028
verticalAlign=:baseline
1029+
view-transition-class=:none
1030+
view-transition-name=:none
1031+
viewTransitionClass=:none
1032+
viewTransitionName=:none
10291033
visibility=:visible
10301034
webkitAlignContent=:normal
10311035
webkitAlignItems=:normal

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,10 @@ vector-effect=:none
10261026
vectorEffect=:none
10271027
vertical-align=:baseline
10281028
verticalAlign=:baseline
1029+
view-transition-class=:none
1030+
view-transition-name=:none
1031+
viewTransitionClass=:none
1032+
viewTransitionName=:none
10291033
visibility=:visible
10301034
webkitAlignContent=:normal
10311035
webkitAlignItems=:normal

0 commit comments

Comments
 (0)