Skip to content

Commit 38c0ef4

Browse files
rbrirbri
committed
chrome 118
1 parent fe89955 commit 38c0ef4

File tree

4 files changed

+59
-5
lines changed

4 files changed

+59
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,10 +1517,10 @@ public enum BrowserVersionFeatures {
15171517
JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_131,
15181518

15191519
/**
1520-
* Difference of window.outer/inner height is 139.
1520+
* Difference of window.outer/inner height is 138.
15211521
*/
15221522
@BrowserFeature(CHROME)
1523-
JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_139,
1523+
JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_138,
15241524

15251525
/**
15261526
* Difference of window.outer/inner height is 86.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

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_131;
19-
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_139;
19+
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_138;
2020
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_86;
2121
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_91;
2222

@@ -99,8 +99,8 @@ else if (webClient.getBrowserVersion().hasFeature(JS_WINDOW_OUTER_INNER_HEIGHT_D
9999
outerHeight_ = innerHeight_ + 131;
100100
outerWidth_ = innerWidth_ + 71;
101101
}
102-
else if (webClient.getBrowserVersion().hasFeature(JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_139)) {
103-
outerHeight_ = innerHeight_ + 139;
102+
else if (webClient.getBrowserVersion().hasFeature(JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_138)) {
103+
outerHeight_ = innerHeight_ + 138;
104104
outerWidth_ = innerWidth_ + 16;
105105
}
106106
else {

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,25 @@ public void port() throws Exception {
612612
"http:", "http://mydomain.com/svn/Repos/",
613613
"ex-unknown"},
614614
IE = {})
615+
@HtmlUnitNYI(
616+
CHROME = {"https:",
617+
"http:", "http://mydomain.com/svn/Repos/",
618+
"http:", "http://mydomain.com/svn/Repos/",
619+
"axdeg:", "axdeg://mydomain.com/svn/Repos/",
620+
"http:", "http://mydomain.com/svn/Repos/",
621+
"http:", "http://mydomain.com/svn/Repos/",
622+
"http:", "http://mydomain.com/svn/Repos/",
623+
"null:", "null://mydomain.com/svn/Repos/",
624+
"ex-unknown"},
625+
EDGE = {"https:",
626+
"http:", "http://mydomain.com/svn/Repos/",
627+
"http:", "http://mydomain.com/svn/Repos/",
628+
"axdeg:", "axdeg://mydomain.com/svn/Repos/",
629+
"http:", "http://mydomain.com/svn/Repos/",
630+
"http:", "http://mydomain.com/svn/Repos/",
631+
"http:", "http://mydomain.com/svn/Repos/",
632+
"null:", "null://mydomain.com/svn/Repos/",
633+
"ex-unknown"})
615634
public void protocol() throws Exception {
616635
final String html =
617636
"<html>\n"
@@ -694,6 +713,39 @@ public void protocol() throws Exception {
694713
"wss:", "wss://mydomain.com/svn/Repos/",
695714
"file:", "file:///svn/Repos/"},
696715
IE = {})
716+
@HtmlUnitNYI(
717+
CHROME = {"https:",
718+
"http:", "http://mydomain.com/svn/Repos/",
719+
"https:", "https://mydomain.com/svn/Repos/",
720+
"ftp:", "ftp://mydomain.com/svn/Repos/",
721+
"ftps:", "ftps://mydomain.com/svn/Repos/",
722+
"ws:", "ws://mydomain.com/svn/Repos/",
723+
"wss:", "wss://mydomain.com/svn/Repos/",
724+
"file:", "file://mydomain.com/svn/Repos/"},
725+
EDGE = {"https:",
726+
"http:", "http://mydomain.com/svn/Repos/",
727+
"https:", "https://mydomain.com/svn/Repos/",
728+
"ftp:", "ftp://mydomain.com/svn/Repos/",
729+
"ftps:", "ftps://mydomain.com/svn/Repos/",
730+
"ws:", "ws://mydomain.com/svn/Repos/",
731+
"wss:", "wss://mydomain.com/svn/Repos/",
732+
"file:", "file://mydomain.com/svn/Repos/"},
733+
FF = {"https:",
734+
"http:", "http://mydomain.com/svn/Repos/",
735+
"https:", "https://mydomain.com/svn/Repos/",
736+
"ftp:", "ftp://mydomain.com/svn/Repos/",
737+
"ftps:", "ftps://mydomain.com/svn/Repos/",
738+
"ws:", "ws://mydomain.com/svn/Repos/",
739+
"wss:", "wss://mydomain.com/svn/Repos/",
740+
"file:", "file://mydomain.com/svn/Repos/"},
741+
FF_ESR = {"https:",
742+
"http:", "http://mydomain.com/svn/Repos/",
743+
"https:", "https://mydomain.com/svn/Repos/",
744+
"ftp:", "ftp://mydomain.com/svn/Repos/",
745+
"ftps:", "ftps://mydomain.com/svn/Repos/",
746+
"ws:", "ws://mydomain.com/svn/Repos/",
747+
"wss:", "wss://mydomain.com/svn/Repos/",
748+
"file:", "file://mydomain.com/svn/Repos/"})
697749
public void specialScheme() throws Exception {
698750
final String html =
699751
"<html>\n"

‎src/test/java/org/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1426,6 +1426,8 @@ public void readWriteProtocol() throws Exception {
14261426
@Alerts(DEFAULT = {"http:", "axdeg:", "axdeg://§§URL§§/foo.html#O"},
14271427
CHROME = {"http:", "http:", "http://§§URL§§/foo.html#O"},
14281428
EDGE = {"http:", "http:", "http://§§URL§§/foo.html#O"})
1429+
@HtmlUnitNYI(CHROME = {"http:", "axdeg:", "axdeg://§§URL§§/foo.html#O"},
1430+
EDGE = {"http:", "axdeg:", "axdeg://§§URL§§/foo.html#O"})
14291431
public void readWriteProtocolUnknown() throws Exception {
14301432
final String html =
14311433
"<html>\n"

0 commit comments

Comments
 (0)