Skip to content

Commit 98da7b5

Browse files
rbrirbri
committed
window.isSecureContext added (issue #573)
1 parent 54d9d30 commit 98da7b5

3 files changed

Lines changed: 21 additions & 9 deletions

File tree

‎src/changes/changes.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
INCOMPATIBLE CHANGE: CookieManager.getPort(URL) removed. Looks like
1313
<a href="http://code.google.com/p/googleappengine/issues/detail?id=4784"> is solved.
1414
</action>
15+
<action type="add" dev="rbri" issue="573">
16+
window.isSecureContext added.
17+
</action>
1518
<action type="fix" dev="rbri">
1619
neko: Template tags are valid inside the head.
1720
</action>

‎src/test/java/org/htmlunit/general/ElementOwnPropertiesTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,8 @@ public void event() throws Exception {
777777
+ "clearInterval(),clearTimeout(),clientInformation,close(),closed,confirm(),constructor(),"
778778
+ "crypto,devicePixelRatio,document,event,external,find(),focus(),frameElement,frames,"
779779
+ "getComputedStyle(),"
780-
+ "getSelection(),history,innerHeight,innerWidth,length,localStorage,location,matchMedia(),"
780+
+ "getSelection(),history,innerHeight,innerWidth,isSecureContext,"
781+
+ "length,localStorage,location,matchMedia(),"
781782
+ "moveBy(),moveTo(),"
782783
+ "name,navigator,offscreenBuffering,onabort,onanimationend,onanimationiteration,onanimationstart,"
783784
+ "onauxclick,onbeforeunload,onblur,oncancel,oncanplay,oncanplaythrough,onchange,onclick,onclose,"
@@ -800,7 +801,8 @@ public void event() throws Exception {
800801
+ "clearInterval(),clearTimeout(),clientInformation,close(),closed,confirm(),constructor(),"
801802
+ "crypto,devicePixelRatio,document,event,external,find(),focus(),frameElement,frames,"
802803
+ "getComputedStyle(),"
803-
+ "getSelection(),history,innerHeight,innerWidth,length,localStorage,location,matchMedia(),"
804+
+ "getSelection(),history,innerHeight,innerWidth,isSecureContext,"
805+
+ "length,localStorage,location,matchMedia(),"
804806
+ "moveBy(),moveTo(),"
805807
+ "name,navigator,offscreenBuffering,onabort,onanimationend,onanimationiteration,onanimationstart,"
806808
+ "onauxclick,onbeforeunload,onblur,oncancel,oncanplay,oncanplaythrough,onchange,onclick,onclose,"
@@ -823,7 +825,8 @@ public void event() throws Exception {
823825
+ "clearInterval(),clearTimeout(),clientInformation,"
824826
+ "close(),closed,confirm(),constructor(),controllers,"
825827
+ "crypto,devicePixelRatio,document,dump(),event,external,find(),focus(),frameElement,frames,"
826-
+ "getComputedStyle(),getSelection(),history,innerHeight,innerWidth,length,localStorage,location,"
828+
+ "getComputedStyle(),getSelection(),history,innerHeight,innerWidth,isSecureContext,"
829+
+ "length,localStorage,location,"
827830
+ "matchMedia(),moveBy(),moveTo(),mozInnerScreenX,mozInnerScreenY,name,navigator,"
828831
+ "netscape,onabort,onafterprint,onanimationend,onanimationiteration,onanimationstart,"
829832
+ "onbeforeprint,onbeforeunload,onblur,oncanplay,oncanplaythrough,"
@@ -844,7 +847,8 @@ public void event() throws Exception {
844847
+ "clearInterval(),clearTimeout(),clientInformation,"
845848
+ "close(),closed,confirm(),constructor(),controllers,"
846849
+ "crypto,devicePixelRatio,document,dump(),event,external,find(),focus(),frameElement,frames,"
847-
+ "getComputedStyle(),getSelection(),history,innerHeight,innerWidth,length,localStorage,location,"
850+
+ "getComputedStyle(),getSelection(),history,innerHeight,innerWidth,isSecureContext,"
851+
+ "length,localStorage,location,"
848852
+ "matchMedia(),moveBy(),moveTo(),mozInnerScreenX,mozInnerScreenY,name,navigator,"
849853
+ "netscape,onabort,onafterprint,onanimationend,onanimationiteration,onanimationstart,"
850854
+ "onbeforeprint,onbeforeunload,onblur,oncanplay,oncanplaythrough,"

‎src/test/java/org/htmlunit/general/ElementPropertiesTest.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,9 @@ public void event() throws Exception {
12131213
@HtmlUnitNYI(CHROME = "addEventListener(),alert(),atob(),blur(),btoa(),cancelAnimationFrame(),"
12141214
+ "captureEvents(),clearInterval(),clearTimeout(),clientInformation,close(),closed,confirm(),"
12151215
+ "crypto,devicePixelRatio,dispatchEvent(),document,event,external,find(),focus(),"
1216-
+ "frameElement,frames,getComputedStyle(),getSelection(),history,innerHeight,innerWidth,length,"
1216+
+ "frameElement,frames,getComputedStyle(),getSelection(),history,"
1217+
+ "innerHeight,innerWidth,isSecureContext,"
1218+
+ "length,"
12171219
+ "localStorage,location,log(),matchMedia(),moveBy(),moveTo(),name,navigator,offscreenBuffering,"
12181220
+ "onabort,onanimationend,onanimationiteration,onanimationstart,onauxclick,onbeforeunload,"
12191221
+ "onblur,oncancel,oncanplay,oncanplaythrough,onchange,onclick,onclose,oncontextmenu,"
@@ -1238,7 +1240,9 @@ public void event() throws Exception {
12381240
EDGE = "addEventListener(),alert(),atob(),blur(),btoa(),cancelAnimationFrame(),"
12391241
+ "captureEvents(),clearInterval(),clearTimeout(),clientInformation,close(),closed,confirm(),"
12401242
+ "crypto,devicePixelRatio,dispatchEvent(),document,event,external,find(),focus(),"
1241-
+ "frameElement,frames,getComputedStyle(),getSelection(),history,innerHeight,innerWidth,length,"
1243+
+ "frameElement,frames,getComputedStyle(),getSelection(),history,"
1244+
+ "innerHeight,innerWidth,isSecureContext,"
1245+
+ "length,"
12421246
+ "localStorage,location,log(),matchMedia(),moveBy(),moveTo(),name,navigator,offscreenBuffering,"
12431247
+ "onabort,onanimationend,onanimationiteration,onanimationstart,onauxclick,onbeforeunload,"
12441248
+ "onblur,oncancel,oncanplay,oncanplaythrough,onchange,onclick,onclose,oncontextmenu,"
@@ -1264,7 +1268,8 @@ public void event() throws Exception {
12641268
+ "captureEvents(),clearInterval(),clearTimeout(),clientInformation,"
12651269
+ "close(),closed,confirm(),controllers,"
12661270
+ "crypto,devicePixelRatio,dispatchEvent(),document,dump(),event,external,find(),focus(),"
1267-
+ "frameElement,frames,getComputedStyle(),getSelection(),history,innerHeight,innerWidth,"
1271+
+ "frameElement,frames,getComputedStyle(),getSelection(),history,"
1272+
+ "innerHeight,innerWidth,isSecureContext,"
12681273
+ "length,localStorage,location,log(),matchMedia(),moveBy(),moveTo(),mozInnerScreenX,mozInnerScreenY,"
12691274
+ "name,navigator,netscape,onabort,"
12701275
+ "onafterprint,onanimationend,onanimationiteration,onanimationstart,onbeforeprint,onbeforeunload,"
@@ -1286,8 +1291,8 @@ public void event() throws Exception {
12861291
+ "captureEvents(),clearInterval(),clearTimeout(),clientInformation,"
12871292
+ "close(),closed,confirm(),controllers,"
12881293
+ "crypto,devicePixelRatio,dispatchEvent(),document,dump(),event,external,find(),focus(),"
1289-
+ "frameElement,frames,getComputedStyle(),getSelection(),history,innerHeight,innerWidth,"
1290-
+ "InstallTrigger,"
1294+
+ "frameElement,frames,getComputedStyle(),getSelection(),history,"
1295+
+ "innerHeight,innerWidth,InstallTrigger,isSecureContext,"
12911296
+ "length,localStorage,location,log(),matchMedia(),moveBy(),moveTo(),mozInnerScreenX,mozInnerScreenY,"
12921297
+ "name,navigator,netscape,onabort,"
12931298
+ "onafterprint,onanimationend,onanimationiteration,onanimationstart,onbeforeprint,onbeforeunload,"

0 commit comments

Comments
 (0)