Bug 1414292. Update to HTML spec changes for cross-origin object property enumerability. r=peterv

marco-c · marco-c · commit 03e416db4338 · 2019-10-02T06:26:14.000Z
Updates to whatwg/html#3186 Includes the changes from web-platform-tests/wpt#8045 MozReview-Commit-ID: 5vEo1QGPufE UltraBlame original commit: 2a5a80d284b5ef958298cf515867ffbe420478c0
diff --git a/js/xpconnect/wrappers/FilteringWrapper.cpp b/js/xpconnect/wrappers/FilteringWrapper.cpp
@@ -1505,24 +1505,40 @@ origin
 DOM
 objects
 are
-non
--
-enumerable
-and
-/
-/
 "
 configurable
 "
 .
 Any
+/
+/
 value
 attributes
 are
 read
 -
 only
 .
+Indexed
+properties
+are
+enumerable
+/
+/
+but
+nothing
+else
+is
+.
+if
+(
+!
+JSID_IS_INT
+(
+id
+)
+)
+{
 desc
 .
 attributesRef
@@ -1533,6 +1549,7 @@ attributesRef
 ~
 JSPROP_ENUMERATE
 ;
+}
 desc
 .
 attributesRef
diff --git a/testing/web-platform/meta/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini b/testing/web-platform/meta/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini
diff --git a/testing/web-platform/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html b/testing/web-platform/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html
@@ -2143,19 +2143,35 @@
 expectWritable
 )
 {
-var
+const
 isSymbol
 =
-(
 typeof
 (
 propName
 )
 =
 =
+=
 "
 symbol
 "
+;
+const
+isArrayIndexPropertyName
+=
+!
+isSymbol
+&
+&
+!
+isNaN
+(
+parseInt
+(
+propName
+10
+)
 )
 ;
 propName
@@ -2208,7 +2224,8 @@
 ;
 if
 (
-isSymbol
+!
+isArrayIndexPropertyName
 )
 {
 assert_equals
@@ -2218,8 +2235,6 @@
 enumerable
 false
 "
-symbol
--
 property
 descriptor
 for
@@ -2235,6 +2250,11 @@
 "
 )
 ;
+if
+(
+isSymbol
+)
+{
 assert_true
 (
 "
@@ -2288,6 +2308,7 @@
 )
 ;
 }
+}
 else
 {
 assert_equals
@@ -3161,7 +3182,7 @@
 ;
 assert_true
 (
-whitelistedWindowPropNames
+whitelistedWindowIndices
 .
 includes
 (
@@ -3186,12 +3207,13 @@
 assert_equals
 (
 i
-whitelistedWindowPropNames
+whitelistedWindowIndices
 .
 length
 "
 Enumerate
 all
+enumerable
 safelisted
 cross
 -
@@ -3219,40 +3241,19 @@
 +
 +
 ;
-assert_true
-(
-whitelistedLocationPropNames
-.
-includes
-(
-prop
-)
-prop
-+
-"
-is
-not
-safelisted
-for
-a
-cross
--
-origin
-Location
-"
-)
-;
 }
 assert_equals
 (
 i
-whitelistedLocationPropNames
-.
-length
+0
 "
-Enumerate
-all
-safelisted
+There
+'
+s
+nothing
+to
+enumerate
+for
 cross
 -
 origin
@@ -3267,6 +3268,7 @@
 only
 enumerate
 safelisted
+enumerable
 properties
 "
 )
@@ -3330,7 +3332,7 @@
 sort
 (
 )
-whitelistedWindowPropNames
+whitelistedWindowIndices
 "
 Object
 .
@@ -3382,7 +3384,7 @@
 "
 )
 ;
-assert_array_equals
+assert_equals
 (
 Object
 .
@@ -3393,10 +3395,8 @@
 location
 )
 .
-sort
-(
-)
-whitelistedLocationPropNames
+length
+0
 "
 Object
 .

Original file line number	Diff line number	Diff line change
`@@ -2143,19 +2143,35 @@`
`2143`	`2143`	`expectWritable`
`2144`	`2144`	`)`
`2145`	`2145`	`{`
`2146`		`-var`
	`2146`	`+const`
`2147`	`2147`	`isSymbol`
`2148`	`2148`	`=`
`2149`		`-(`
`2150`	`2149`	`typeof`
`2151`	`2150`	`(`
`2152`	`2151`	`propName`
`2153`	`2152`	`)`
`2154`	`2153`	`=`
`2155`	`2154`	`=`
	`2155`	`+=`
`2156`	`2156`	`"`
`2157`	`2157`	`symbol`
`2158`	`2158`	`"`
	`2159`	`+;`
	`2160`	`+const`
	`2161`	`+isArrayIndexPropertyName`
	`2162`	`+=`
	`2163`	`+!`
	`2164`	`+isSymbol`
	`2165`	`+&`
	`2166`	`+&`
	`2167`	`+!`
	`2168`	`+isNaN`
	`2169`	`+(`
	`2170`	`+parseInt`
	`2171`	`+(`
	`2172`	`+propName`
	`2173`	`+10`
	`2174`	`+)`
`2159`	`2175`	`)`
`2160`	`2176`	`;`
`2161`	`2177`	`propName`
`@@ -2208,7 +2224,8 @@`
`2208`	`2224`	`;`
`2209`	`2225`	`if`
`2210`	`2226`	`(`
`2211`		`-isSymbol`
	`2227`	`+!`
	`2228`	`+isArrayIndexPropertyName`
`2212`	`2229`	`)`
`2213`	`2230`	`{`
`2214`	`2231`	`assert_equals`
`@@ -2218,8 +2235,6 @@`
`2218`	`2235`	`enumerable`
`2219`	`2236`	`false`
`2220`	`2237`	`"`
`2221`		`-symbol`
`2222`		`--`
`2223`	`2238`	`property`
`2224`	`2239`	`descriptor`
`2225`	`2240`	`for`
`@@ -2235,6 +2250,11 @@`
`2235`	`2250`	`"`
`2236`	`2251`	`)`
`2237`	`2252`	`;`
	`2253`	`+if`
	`2254`	`+(`
	`2255`	`+isSymbol`
	`2256`	`+)`
	`2257`	`+{`
`2238`	`2258`	`assert_true`
`2239`	`2259`	`(`
`2240`	`2260`	`"`
`@@ -2288,6 +2308,7 @@`
`2288`	`2308`	`)`
`2289`	`2309`	`;`
`2290`	`2310`	`}`
	`2311`	`+}`
`2291`	`2312`	`else`
`2292`	`2313`	`{`
`2293`	`2314`	`assert_equals`
`@@ -3161,7 +3182,7 @@`
`3161`	`3182`	`;`
`3162`	`3183`	`assert_true`
`3163`	`3184`	`(`
`3164`		`-whitelistedWindowPropNames`
	`3185`	`+whitelistedWindowIndices`
`3165`	`3186`	`.`
`3166`	`3187`	`includes`
`3167`	`3188`	`(`
`@@ -3186,12 +3207,13 @@`
`3186`	`3207`	`assert_equals`
`3187`	`3208`	`(`
`3188`	`3209`	`i`
`3189`		`-whitelistedWindowPropNames`
	`3210`	`+whitelistedWindowIndices`
`3190`	`3211`	`.`
`3191`	`3212`	`length`
`3192`	`3213`	`"`
`3193`	`3214`	`Enumerate`
`3194`	`3215`	`all`
	`3216`	`+enumerable`
`3195`	`3217`	`safelisted`
`3196`	`3218`	`cross`
`3197`	`3219`	`-`
`@@ -3219,40 +3241,19 @@`
`3219`	`3241`	`+`
`3220`	`3242`	`+`
`3221`	`3243`	`;`
`3222`		`-assert_true`
`3223`		`-(`
`3224`		`-whitelistedLocationPropNames`
`3225`		`-.`
`3226`		`-includes`
`3227`		`-(`
`3228`		`-prop`
`3229`		`-)`
`3230`		`-prop`
`3231`		`-+`
`3232`		`-"`
`3233`		`-is`
`3234`		`-not`
`3235`		`-safelisted`
`3236`		`-for`
`3237`		`-a`
`3238`		`-cross`
`3239`		`--`
`3240`		`-origin`
`3241`		`-Location`
`3242`		`-"`
`3243`		`-)`
`3244`		`-;`
`3245`	`3244`	`}`
`3246`	`3245`	`assert_equals`
`3247`	`3246`	`(`
`3248`	`3247`	`i`
`3249`		`-whitelistedLocationPropNames`
`3250`		`-.`
`3251`		`-length`
	`3248`	`+0`
`3252`	`3249`	`"`
`3253`		`-Enumerate`
`3254`		`-all`
`3255`		`-safelisted`
	`3250`	`+There`
	`3251`	`+'`
	`3252`	`+s`
	`3253`	`+nothing`
	`3254`	`+to`
	`3255`	`+enumerate`
	`3256`	`+for`
`3256`	`3257`	`cross`
`3257`	`3258`	`-`
`3258`	`3259`	`origin`
`@@ -3267,6 +3268,7 @@`
`3267`	`3268`	`only`
`3268`	`3269`	`enumerate`
`3269`	`3270`	`safelisted`
	`3271`	`+enumerable`
`3270`	`3272`	`properties`
`3271`	`3273`	`"`
`3272`	`3274`	`)`
`@@ -3330,7 +3332,7 @@`
`3330`	`3332`	`sort`
`3331`	`3333`	`(`
`3332`	`3334`	`)`
`3333`		`-whitelistedWindowPropNames`
	`3335`	`+whitelistedWindowIndices`
`3334`	`3336`	`"`
`3335`	`3337`	`Object`
`3336`	`3338`	`.`
`@@ -3382,7 +3384,7 @@`
`3382`	`3384`	`"`
`3383`	`3385`	`)`
`3384`	`3386`	`;`
`3385`		`-assert_array_equals`
	`3387`	`+assert_equals`
`3386`	`3388`	`(`
`3387`	`3389`	`Object`
`3388`	`3390`	`.`
`@@ -3393,10 +3395,8 @@`
`3393`	`3395`	`location`
`3394`	`3396`	`)`
`3395`	`3397`	`.`
`3396`		`-sort`
`3397`		`-(`
`3398`		`-)`
`3399`		`-whitelistedLocationPropNames`
	`3398`	`+length`
	`3399`	`+0`
`3400`	`3400`	`"`
`3401`	`3401`	`Object`
`3402`	`3402`	`.`