Skip to content

Commit

Permalink
chrome 118
Browse files Browse the repository at this point in the history
  • Loading branch information
rbri committed Oct 17, 2023
1 parent fe89955 commit 38c0ef4
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/main/java/org/htmlunit/BrowserVersionFeatures.java
Original file line number Diff line number Diff line change
Expand Up @@ -1517,10 +1517,10 @@ public enum BrowserVersionFeatures {
JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_131,

/**
* Difference of window.outer/inner height is 139.
* Difference of window.outer/inner height is 138.
*/
@BrowserFeature(CHROME)
JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_139,
JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_138,

/**
* Difference of window.outer/inner height is 86.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/htmlunit/WebWindowImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_COMPUTED_STYLE_PSEUDO_ACCEPT_WITHOUT_COLON;
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_131;
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_139;
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_138;
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_86;
import static org.htmlunit.BrowserVersionFeatures.JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_91;

Expand Down Expand Up @@ -99,8 +99,8 @@ else if (webClient.getBrowserVersion().hasFeature(JS_WINDOW_OUTER_INNER_HEIGHT_D
outerHeight_ = innerHeight_ + 131;
outerWidth_ = innerWidth_ + 71;
}
else if (webClient.getBrowserVersion().hasFeature(JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_139)) {
outerHeight_ = innerHeight_ + 139;
else if (webClient.getBrowserVersion().hasFeature(JS_WINDOW_OUTER_INNER_HEIGHT_DIFF_138)) {
outerHeight_ = innerHeight_ + 138;
outerWidth_ = innerWidth_ + 16;
}
else {
Expand Down
52 changes: 52 additions & 0 deletions src/test/java/org/htmlunit/javascript/host/URLTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,25 @@ public void port() throws Exception {
"http:", "http://mydomain.com/svn/Repos/",
"ex-unknown"},
IE = {})
@HtmlUnitNYI(
CHROME = {"https:",
"http:", "http://mydomain.com/svn/Repos/",
"http:", "http://mydomain.com/svn/Repos/",
"axdeg:", "axdeg://mydomain.com/svn/Repos/",
"http:", "http://mydomain.com/svn/Repos/",
"http:", "http://mydomain.com/svn/Repos/",
"http:", "http://mydomain.com/svn/Repos/",
"null:", "null://mydomain.com/svn/Repos/",
"ex-unknown"},
EDGE = {"https:",
"http:", "http://mydomain.com/svn/Repos/",
"http:", "http://mydomain.com/svn/Repos/",
"axdeg:", "axdeg://mydomain.com/svn/Repos/",
"http:", "http://mydomain.com/svn/Repos/",
"http:", "http://mydomain.com/svn/Repos/",
"http:", "http://mydomain.com/svn/Repos/",
"null:", "null://mydomain.com/svn/Repos/",
"ex-unknown"})
public void protocol() throws Exception {
final String html =
"<html>\n"
Expand Down Expand Up @@ -694,6 +713,39 @@ public void protocol() throws Exception {
"wss:", "wss://mydomain.com/svn/Repos/",
"file:", "file:///svn/Repos/"},
IE = {})
@HtmlUnitNYI(
CHROME = {"https:",
"http:", "http://mydomain.com/svn/Repos/",
"https:", "https://mydomain.com/svn/Repos/",
"ftp:", "ftp://mydomain.com/svn/Repos/",
"ftps:", "ftps://mydomain.com/svn/Repos/",
"ws:", "ws://mydomain.com/svn/Repos/",
"wss:", "wss://mydomain.com/svn/Repos/",
"file:", "file://mydomain.com/svn/Repos/"},
EDGE = {"https:",
"http:", "http://mydomain.com/svn/Repos/",
"https:", "https://mydomain.com/svn/Repos/",
"ftp:", "ftp://mydomain.com/svn/Repos/",
"ftps:", "ftps://mydomain.com/svn/Repos/",
"ws:", "ws://mydomain.com/svn/Repos/",
"wss:", "wss://mydomain.com/svn/Repos/",
"file:", "file://mydomain.com/svn/Repos/"},
FF = {"https:",
"http:", "http://mydomain.com/svn/Repos/",
"https:", "https://mydomain.com/svn/Repos/",
"ftp:", "ftp://mydomain.com/svn/Repos/",
"ftps:", "ftps://mydomain.com/svn/Repos/",
"ws:", "ws://mydomain.com/svn/Repos/",
"wss:", "wss://mydomain.com/svn/Repos/",
"file:", "file://mydomain.com/svn/Repos/"},
FF_ESR = {"https:",
"http:", "http://mydomain.com/svn/Repos/",
"https:", "https://mydomain.com/svn/Repos/",
"ftp:", "ftp://mydomain.com/svn/Repos/",
"ftps:", "ftps://mydomain.com/svn/Repos/",
"ws:", "ws://mydomain.com/svn/Repos/",
"wss:", "wss://mydomain.com/svn/Repos/",
"file:", "file://mydomain.com/svn/Repos/"})
public void specialScheme() throws Exception {
final String html =
"<html>\n"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1426,6 +1426,8 @@ public void readWriteProtocol() throws Exception {
@Alerts(DEFAULT = {"http:", "axdeg:", "axdeg://§§URL§§/foo.html#O"},
CHROME = {"http:", "http:", "http://§§URL§§/foo.html#O"},
EDGE = {"http:", "http:", "http://§§URL§§/foo.html#O"})
@HtmlUnitNYI(CHROME = {"http:", "axdeg:", "axdeg://§§URL§§/foo.html#O"},
EDGE = {"http:", "axdeg:", "axdeg://§§URL§§/foo.html#O"})
public void readWriteProtocolUnknown() throws Exception {
final String html =
"<html>\n"
Expand Down

0 comments on commit 38c0ef4

Please sign in to comment.