Skip to content

Commit 7b780c5

Browse files
rbrirbri
committed
FF 144
1 parent 0c8c8b4 commit 7b780c5

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,10 +409,10 @@ public enum BrowserVersionFeatures {
409409
JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_147,
410410

411411
/**
412-
* Difference of window.outer/inner height is 93.
412+
* Difference of window.outer/inner height is 94.
413413
*/
414414
@BrowserFeature({FF, FF_ESR})
415-
JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_93,
415+
JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_94,
416416

417417
/** Window.getSelection returns null, if the window is not visible. */
418418
@BrowserFeature({FF, FF_ESR})

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_COMPUTED_STYLE_PSEUDO_ACCEPT_WITHOUT_COLON;
1818
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_138;
1919
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_147;
20-
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_93;
20+
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_94;
2121

2222
import java.io.IOException;
2323
import java.io.ObjectInputStream;
@@ -84,8 +84,8 @@ public WebWindowImpl(final WebClient webClient) {
8484

8585
innerHeight_ = 605;
8686
innerWidth_ = 1256;
87-
if (webClient.getBrowserVersion().hasFeature(JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_93)) {
88-
outerHeight_ = innerHeight_ + 93;
87+
if (webClient.getBrowserVersion().hasFeature(JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_94)) {
88+
outerHeight_ = innerHeight_ + 94;
8989
outerWidth_ = innerWidth_ + 16;
9090
}
9191
else if (webClient.getBrowserVersion().hasFeature(JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_138)) {

‎src/main/java/org/htmlunit/javascript/host/Window.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1799,7 +1799,7 @@ public int getMozInnerScreenX() {
17991799
*/
18001800
@JsxGetter({FF, FF_ESR})
18011801
public int getMozInnerScreenY() {
1802-
return 89;
1802+
return 90;
18031803
}
18041804

18051805
private static final class Filter {

‎src/test/java/org/htmlunit/javascript/host/Window2Test.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -950,12 +950,12 @@ public void IEScriptEngineXxx() throws Exception {
950950
@Test
951951
@Alerts(CHROME = {"true", "621", "147", "true", "16", "16"},
952952
EDGE = {"true", "630", "138", "true", "16", "24"},
953-
FF = {"true", "675", "93", "true", "16", "16"},
954-
FF_ESR = {"true", "675", "93", "true", "16", "16"})
953+
FF = {"true", "674", "94", "true", "16", "16"},
954+
FF_ESR = {"true", "674", "94", "true", "16", "16"})
955955
@HtmlUnitNYI(CHROME = {"true", "605", "147", "true", "0", "16"},
956956
EDGE = {"true", "605", "138", "true", "0", "24"},
957-
FF = {"true", "605", "93", "true", "0", "16"},
958-
FF_ESR = {"true", "605", "93", "true", "0", "16"})
957+
FF = {"true", "605", "94", "true", "0", "16"},
958+
FF_ESR = {"true", "605", "94", "true", "0", "16"})
959959
public void heightsAndWidths() throws Exception {
960960
final String html = DOCTYPE_HTML
961961
+ "<html><body onload='test()'><script>\n"
@@ -980,8 +980,8 @@ public void heightsAndWidths() throws Exception {
980980
@Test
981981
@Alerts(CHROME = {"true", "0", "147", "true", "true", "16"},
982982
EDGE = {"true", "0", "138", "true", "true", "24"},
983-
FF = {"true", "0", "93", "true", "true", "16"},
984-
FF_ESR = {"true", "0", "93", "true", "true", "16"})
983+
FF = {"true", "0", "94", "true", "true", "16"},
984+
FF_ESR = {"true", "0", "94", "true", "true", "16"})
985985
public void heightsAndWidthsQuirks() throws Exception {
986986
final String html =
987987
"<html><body onload='test()'><script>\n"
@@ -1121,8 +1121,8 @@ public void changeHeightsAndWidths() throws Exception {
11211121
@Test
11221122
@Alerts(CHROME = {"621", "1256", "606", "1241"},
11231123
EDGE = {"630", "1248", "615", "1233"},
1124-
FF = {"675", "1256", "658", "1239"},
1125-
FF_ESR = {"675", "1256", "658", "1239"})
1124+
FF = {"674", "1256", "674", "1256"},
1125+
FF_ESR = {"674", "1256", "674", "1256"})
11261126
// TODO width and height calculation needs to be reworked in HtmlUnit
11271127
// but as the calculation might be effected by e.g. current windows style it is not that simple
11281128
@HtmlUnitNYI(CHROME = {"605", "1256", "705", "1256"},
@@ -1317,8 +1317,8 @@ public void typeof() throws Exception {
13171317
*/
13181318
@Test
13191319
@Alerts(DEFAULT = {"undefined", "undefined"},
1320-
FF = {"12", "89"},
1321-
FF_ESR = {"12", "89"})
1320+
FF = {"12", "90"},
1321+
FF_ESR = {"12", "90"})
13221322
public void mozInnerScreen() throws Exception {
13231323
final String html = DOCTYPE_HTML
13241324
+ "<html><body onload='test()'><script>\n"

0 commit comments

Comments
 (0)