Skip to content

Commit 8dc9913

Browse files
rbrirbri
committed
Firefox 149, Chrome 147
1 parent 83e3af5 commit 8dc9913

46 files changed

Lines changed: 2418 additions & 1887 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/org/htmlunit/BrowserVersion.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ public final class BrowserVersion implements Serializable {
7373
public static final BrowserVersion FIREFOX_ESR = new BrowserVersion(FIREFOX_ESR_NUMERIC, "FF-ESR");
7474

7575
/** Latest Chrome. */
76-
public static final BrowserVersion CHROME = new BrowserVersion(143, "Chrome");
76+
public static final BrowserVersion CHROME = new BrowserVersion(147, "Chrome");
7777

7878
/** Latest Edge. */
79-
public static final BrowserVersion EDGE = new BrowserVersion(143, "Edge");
79+
public static final BrowserVersion EDGE = new BrowserVersion(147, "Edge");
8080

8181
/**
8282
* Array with all supported browsers.
@@ -198,8 +198,8 @@ public final class BrowserVersion implements Serializable {
198198
CHROME.scriptAcceptHeader_ = "*/*";
199199

200200
CHROME.secClientHintUserAgentHeader_ = "\"Google Chrome\";v=\""
201-
+ CHROME.getBrowserVersionNumeric() + "\", \"Chromium\";v=\""
202-
+ CHROME.getBrowserVersionNumeric() + "\", \"Not A(Brand\";v=\"24\"";
201+
+ CHROME.getBrowserVersionNumeric() + "\", \"Not.A/Brand\";v=\"8\", \"Chromium\";v=\""
202+
+ CHROME.getBrowserVersionNumeric() + "\"";
203203

204204
CHROME.fontHeights_ = new int[] {
205205
0, 1, 2, 4, 5, 5, 6, 8, 9, 10, 11, 12, 15, 16, 16, 17, 18, 20, 21, 22, 23, 25, 26, 26,

‎src/main/java/org/htmlunit/BrowserVersionFeatures.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ public enum BrowserVersionFeatures {
106106
@BrowserFeature({FF, FF_ESR})
107107
HTMLBASEFONT_END_TAG_FORBIDDEN,
108108

109-
/** willValidate does not check the readonly property. */
110-
@BrowserFeature({FF, FF_ESR})
111-
HTMLBUTTON_WILL_VALIDATE_IGNORES_READONLY,
112-
113109
/** HtmlCollection.namedItem searches by id first. */
114110
@BrowserFeature({CHROME, EDGE})
115111
HTMLCOLLECTION_NAMED_ITEM_ID_FIRST,
@@ -384,14 +380,6 @@ public enum BrowserVersionFeatures {
384380
@BrowserFeature({FF, FF_ESR})
385381
JS_STORAGE_PRESERVED_INCLUDED,
386382

387-
/** Indicates letterSpacing support percent values. */
388-
@BrowserFeature({FF, FF_ESR})
389-
JS_STYLE_LETTER_SPACING_ACCEPTS_PERCENT,
390-
391-
/** Indicates wordSpacing support percent values. */
392-
@BrowserFeature({FF, FF_ESR})
393-
JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT,
394-
395383
/** window.getComputedStyle works with pseudo selectors without colon in front. */
396384
@BrowserFeature({CHROME, EDGE})
397385
JS_WINDOW_COMPUTED_STYLE_PSEUDO_ACCEPT_WITHOUT_COLON,

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ static BrowserConfiguration chromeAndEdgeNotIterable(final String defaultValue)
9393
return new ChromeAndEdgeNotIterable(defaultValue);
9494
}
9595

96+
static BrowserConfiguration ffAuto() {
97+
return new FF("auto");
98+
}
99+
96100
static BrowserConfiguration ffNone() {
97101
return new FF("none");
98102
}

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

Lines changed: 313 additions & 221 deletions
Large diffs are not rendered by default.

‎src/main/java/org/htmlunit/html/HtmlButton.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
*/
1515
package org.htmlunit.html;
1616

17-
import static org.htmlunit.BrowserVersionFeatures.HTMLBUTTON_WILL_VALIDATE_IGNORES_READONLY;
1817
import static org.htmlunit.html.HtmlForm.ATTRIBUTE_FORMNOVALIDATE;
1918

2019
import java.io.IOException;
@@ -357,8 +356,7 @@ public boolean willValidate() {
357356
return false;
358357
}
359358

360-
return !isDisabled()
361-
&& (hasFeature(HTMLBUTTON_WILL_VALIDATE_IGNORES_READONLY) || !isReadOnly());
359+
return !isDisabled();
362360
}
363361

364362
/**

‎src/main/java/org/htmlunit/javascript/host/css/CSSStyleDeclaration.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
package org.htmlunit.javascript.host.css;
1616

1717
import static org.htmlunit.BrowserVersionFeatures.CSS_BACKGROUND_INITIAL;
18-
import static org.htmlunit.BrowserVersionFeatures.JS_STYLE_LETTER_SPACING_ACCEPTS_PERCENT;
19-
import static org.htmlunit.BrowserVersionFeatures.JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT;
2018
import static org.htmlunit.css.CssStyleSheet.ABSOLUTE;
2119
import static org.htmlunit.css.CssStyleSheet.AUTO;
2220
import static org.htmlunit.css.CssStyleSheet.FIXED;
@@ -967,8 +965,7 @@ public String getLetterSpacing() {
967965
*/
968966
@JsxSetter
969967
public void setLetterSpacing(final Object letterSpacing) {
970-
setStyleLengthAttribute(Definition.LETTER_SPACING.getAttributeName(), letterSpacing, "",
971-
false, getBrowserVersion().hasFeature(JS_STYLE_LETTER_SPACING_ACCEPTS_PERCENT), null);
968+
setStyleLengthAttribute(Definition.LETTER_SPACING.getAttributeName(), letterSpacing, "", false, true, null);
972969
}
973970

974971
/**
@@ -1774,7 +1771,7 @@ public String getWordSpacing() {
17741771
@JsxSetter
17751772
public void setWordSpacing(final Object wordSpacing) {
17761773
setStyleLengthAttribute(Definition.WORD_SPACING.getAttributeName(), wordSpacing, "",
1777-
false, getBrowserVersion().hasFeature(JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT), null);
1774+
false, true, null);
17781775
}
17791776

17801777
/**
@@ -1880,11 +1877,11 @@ else if (Definition.OUTLINE_WIDTH.getAttributeName().equals(name)) {
18801877
}
18811878
else if (Definition.LETTER_SPACING.getAttributeName().equals(name)) {
18821879
setStyleLengthAttribute(Definition.LETTER_SPACING.getAttributeName(), value, imp,
1883-
false, getBrowserVersion().hasFeature(JS_STYLE_LETTER_SPACING_ACCEPTS_PERCENT), null);
1880+
false, true, null);
18841881
}
18851882
else if (Definition.WORD_SPACING.getAttributeName().equals(name)) {
18861883
setStyleLengthAttribute(Definition.WORD_SPACING.getAttributeName(), value, imp,
1887-
false, getBrowserVersion().hasFeature(JS_STYLE_WORD_SPACING_ACCEPTS_PERCENT), null);
1884+
false, true, null);
18881885
}
18891886
else if (Definition.VERTICAL_ALIGN.getAttributeName().equals(name)) {
18901887
setStyleLengthAttribute(Definition.VERTICAL_ALIGN.getAttributeName(), value, imp, false, true, null);

‎src/test/java/org/htmlunit/BrowserVersionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public class BrowserVersionTest {
4040
public void getBrowserVersionNumeric() {
4141
assertEquals(146, BrowserVersion.FIREFOX.getBrowserVersionNumeric());
4242
assertEquals(140, BrowserVersion.FIREFOX_ESR.getBrowserVersionNumeric());
43-
assertEquals(143, BrowserVersion.CHROME.getBrowserVersionNumeric());
44-
assertEquals(143, BrowserVersion.EDGE.getBrowserVersionNumeric());
43+
assertEquals(147, BrowserVersion.CHROME.getBrowserVersionNumeric());
44+
assertEquals(147, BrowserVersion.EDGE.getBrowserVersionNumeric());
4545
}
4646

4747
/**

‎src/test/java/org/htmlunit/ExternalTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class ExternalTest {
5555
static final String CHROME_DRIVER_URL_ =
5656
"https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json";
5757

58-
static final String EDGE_DRIVER_ = "145.0.3800";
58+
static final String EDGE_DRIVER_ = "147.0.3912";
5959
static final String EDGE_DRIVER_URL_ = "https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/";
6060

6161
/** Gecko driver. */

0 commit comments

Comments
 (0)